Commit Graph

618 Commits

Author SHA1 Message Date
Brian Behlendorf 62ce1a5d0e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-08 10:29:29 -08:00
Brian Behlendorf b7d9adb500 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-08 10:27:42 -08:00
Brian Behlendorf b457fb49f9 Remove vdev_disk from userspace build, vdev_file is used 2009-01-08 10:23:59 -08:00
Brian Behlendorf 4996278dd4 Refresh autogen products 2009-01-05 13:48:29 -08:00
Brian Behlendorf 46d1c1ff3d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 13:47:32 -08:00
Brian Behlendorf 80ed6c342d Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-05 13:46:06 -08:00
Brian Behlendorf c15fa0ceb0 Add include paths 2009-01-05 13:44:26 -08:00
Brian Behlendorf 9eebf90277 Refresh autogen products 2009-01-05 13:40:25 -08:00
Brian Behlendorf 1f02aaba1c Refresh autogen products 2009-01-05 12:47:00 -08:00
Brian Behlendorf aaefbb4e76 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 12:45:45 -08:00
Brian Behlendorf 9a0cb95b1b Resolve conflict 2009-01-05 12:38:23 -08:00
Brian Behlendorf ce7115b807 Add unicode makefile references and support 2009-01-05 12:33:09 -08:00
Brian Behlendorf ced77c2f1b Add unicode makefile references and support 2009-01-05 12:32:55 -08:00
Brian Behlendorf cbee2aba7e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-01-05 11:54:54 -08:00
Brian Behlendorf 1b327abcfd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-05 11:54:52 -08:00
Brian Behlendorf 3d2e086e21 Remove u8 support, moved to libu8 2009-01-05 11:52:51 -08:00
Brian Behlendorf 9403f4a605 Refresh autogen products 2008-12-23 12:39:25 -08:00
Brian Behlendorf d8c0d57440 Refresh autogen products 2008-12-23 10:41:37 -08:00
Brian Behlendorf fccc852847 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 15:21:13 -08:00
Brian Behlendorf 53f2b61ce1 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 15:21:10 -08:00
Brian Behlendorf 89585b82fa Add missing limits 2008-12-22 15:17:57 -08:00
Brian Behlendorf 29baca7561 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 15:06:45 -08:00
Brian Behlendorf 3251158230 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 15:06:42 -08:00
Brian Behlendorf 091c16c185 Add missing tzfile.h 2008-12-22 15:04:47 -08:00
Brian Behlendorf 9481daedcd Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 14:59:09 -08:00
Brian Behlendorf 314e57ba29 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 14:59:06 -08:00
Brian Behlendorf b0704f1597 Add missing header for ztest 2008-12-22 14:57:15 -08:00
Brian Behlendorf d46a4ba0dc Refresh autogen products 2008-12-22 14:55:05 -08:00
Brian Behlendorf f23a920ddd Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 14:45:48 -08:00
Brian Behlendorf ef6c136edb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 14:45:33 -08:00
Brian Behlendorf ff8a2f61ff Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 14:44:07 -08:00
Brian Behlendorf 29b47d366e Remove some headers 2008-12-22 14:42:02 -08:00
Brian Behlendorf 75b5893ca5 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 13:53:09 -08:00
Brian Behlendorf fa078fa9dd Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 13:52:53 -08:00
Brian Behlendorf 05fafc638f Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 13:51:21 -08:00
Brian Behlendorf 90e5216ea9 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 13:51:17 -08:00
Brian Behlendorf 035e4d373e Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 13:51:16 -08:00
Brian Behlendorf c9597f9a4f Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 13:51:15 -08:00
Brian Behlendorf 6bed331e59 More compat changes 2008-12-22 13:47:58 -08:00
Brian Behlendorf d1178104fb Refresh autogen products 2008-12-22 12:55:48 -08:00
Brian Behlendorf d259de062c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:55:11 -08:00
Brian Behlendorf 57e03b4986 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 12:54:57 -08:00
Brian Behlendorf b93191445c Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 12:53:27 -08:00
Brian Behlendorf 121effcbee Pull everything in to the Makefile 2008-12-22 12:51:03 -08:00
Brian Behlendorf 02d41bf31e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:27:04 -08:00
Brian Behlendorf 1e9c6b3020 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:24:47 -08:00
Brian Behlendorf 79491b69f4 Start linux-have-zpl layer 2008-12-22 12:23:27 -08:00
Brian Behlendorf 08a400676b Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 12:09:15 -08:00
Brian Behlendorf a6d6f31db6 Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 12:09:08 -08:00
Brian Behlendorf d7d260b870 Removing branch to readd under new name 2008-12-22 12:05:11 -08:00