Commit Graph

154 Commits

Author SHA1 Message Date
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
Brian Behlendorf 4f1e40767b Refresh autogen products 2008-12-22 11:46:00 -08:00
Brian Behlendorf 397cdbf7f8 Fix typo 2008-12-22 11:43:14 -08:00
Brian Behlendorf 31ff40b9ec Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 11:42:32 -08:00
Brian Behlendorf 7b4bf789e9 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:41:50 -08:00
Brian Behlendorf aece7f6822 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:40:54 -08:00
Brian Behlendorf 7403ce6856 Add missing Makefile foo 2008-12-22 11:38:58 -08:00
Brian Behlendorf 8cc9fdcd1c Refresh autogen products 2008-12-22 11:31:34 -08:00
Brian Behlendorf 8a667a0028 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 11:31:02 -08:00
Brian Behlendorf a97fc13639 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:30:21 -08:00
Brian Behlendorf 06ab7d120f Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:29:25 -08:00
Brian Behlendorf 6b1fc7b8ee Add linker flags 2008-12-22 11:27:30 -08:00
Brian Behlendorf 356e666729 Add linker flags 2008-12-22 11:26:16 -08:00
Brian Behlendorf 9fb38f075b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 11:25:39 -08:00
Brian Behlendorf 24a90ad2c3 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 11:25:38 -08:00
Brian Behlendorf 34d556babb Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 11:25:37 -08:00
Brian Behlendorf 7c89e6b7d5 Fix prototype 2008-12-22 11:25:28 -08:00
Brian Behlendorf 75abffec39 Refresh autogen products 2008-12-22 11:10:13 -08:00
Brian Behlendorf cd5f4d7e5d Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 11:09:22 -08:00
Brian Behlendorf aa52ed7d95 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 11:08:39 -08:00
Brian Behlendorf bf09a72b9a Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 11:07:42 -08:00
Brian Behlendorf feb8953178 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 11:07:39 -08:00
Brian Behlendorf b8245db563 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 11:07:38 -08:00
Brian Behlendorf 03c0e92dfa Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 11:07:35 -08:00
Brian Behlendorf e18ac20f8c Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 11:07:35 -08:00
Brian Behlendorf feb8aecd47 Fix prototype 2008-12-22 11:05:41 -08:00
Brian Behlendorf fdd6fa0727 We don't need to #undef verify here, this is handled better now with the verify cleanup 2008-12-22 11:02:23 -08:00
Brian Behlendorf 4bf318d0a8 Add needed libs 2008-12-22 11:00:47 -08:00
Brian Behlendorf b68bbdcf32 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 10:24:54 -08:00
Brian Behlendorf 7debf8e578 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 10:24:13 -08:00
Brian Behlendorf 79e25a5194 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2008-12-22 10:23:18 -08:00
Brian Behlendorf a9e37c248d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 10:23:16 -08:00
Brian Behlendorf 342c4d05d6 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 10:23:15 -08:00
Brian Behlendorf 817ecade1a Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 10:23:14 -08:00
Brian Behlendorf 6da71c1404 Fix twop more missing voids in prototypes 2008-12-22 10:20:57 -08:00
Brian Behlendorf 31060d339c Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 10:11:33 -08:00
Brian Behlendorf 8b0a74c863 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 10:11:31 -08:00
Brian Behlendorf c72d6b30e8 Remove one more header 2008-12-22 10:07:53 -08:00
Brian Behlendorf 8cee053327 Refresh autogen products 2008-12-22 09:28:14 -08:00
Brian Behlendorf e7d9beb361 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2008-12-22 09:27:41 -08:00
Brian Behlendorf d52676f52b Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 09:26:35 -08:00
Brian Behlendorf b608990fea Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 09:25:52 -08:00
Brian Behlendorf ecf38d314e Resolve conflict 2008-12-22 09:25:04 -08:00
Brian Behlendorf b58e34e0d8 Update makefiles 2008-12-22 09:22:39 -08:00
Brian Behlendorf f583bf4e89 Refresh autogen products 2008-12-22 09:14:09 -08:00