Commit Graph

1862 Commits

Author SHA1 Message Date
Brian Behlendorf 552c9e1abb Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 14:18:10 -08:00
Brian Behlendorf 76151804d7 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 14:18:09 -08:00
Brian Behlendorf c6f1eca44b Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 14:18:09 -08:00
Brian Behlendorf 2ea04834bf Remove assertion for now 2009-01-13 14:16:11 -08:00
Brian Behlendorf 12b7ed892c Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 14:14:22 -08:00
Brian Behlendorf d8561dd52a Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 14:14:22 -08:00
Brian Behlendorf c638d63e0e New TopGit dependency: fix-list 2009-01-13 14:14:20 -08:00
Brian Behlendorf 877f035097 Add topmsg 2009-01-13 14:14:11 -08:00
Brian Behlendorf 20bc74fccf Remove dependency 2009-01-13 14:11:50 -08:00
Brian Behlendorf c4f7d991f6 New TopGit dependency: fix-list 2009-01-13 14:08:14 -08:00
Brian Behlendorf eea2f939cb Remove fix-list 2009-01-13 14:06:30 -08:00
Brian Behlendorf f7295e4683 New TopGit dependency: fix-list 2009-01-13 13:47:51 -08:00
Brian Behlendorf a5643b08c3 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 13:33:16 -08:00
Brian Behlendorf 935c8157f9 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 13:33:09 -08:00
Brian Behlendorf f8b66dcc4f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 13:32:31 -08:00
Brian Behlendorf 16c26fa9cd Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-13 13:32:30 -08:00
Brian Behlendorf 8ad629750e Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-13 13:32:30 -08:00
Brian Behlendorf bb9b10a830 Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-13 13:32:29 -08:00
Brian Behlendorf b73b29ab8e Fix c90 issue with { } 2009-01-13 13:30:35 -08:00
Brian Behlendorf d07009d2f7 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 12:32:18 -08:00
Brian Behlendorf 5a36a4b40b Pull in needed hunk from old patch stack for a ZFS build without the ZPL support 2009-01-13 12:28:26 -08:00
Brian Behlendorf fafbdf448a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 11:57:12 -08:00
Brian Behlendorf 04a87f57ca Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 11:57:05 -08:00
Brian Behlendorf bba6e9829d Handle the case when 'module-name=' is passed down without args. This is handy and shouldn't generate warnings 2009-01-13 11:54:38 -08:00
Brian Behlendorf 6fb39a7c33 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 09:55:35 -08:00
Brian Behlendorf ef6d827a88 Don't check HAVE_SPL unavailable in userspace build 2009-01-13 09:53:35 -08:00
Brian Behlendorf ca328c5d30 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 16:54:04 -08:00
Brian Behlendorf 3977cefecc Update load/unload message, mknod /dev/zfs when udev is unavailable 2009-01-09 16:50:28 -08:00
Brian Behlendorf e22bfeab4e Update load/unload message, mknod /dev/zfs when udev is unavailable 2009-01-09 16:50:08 -08:00
Brian Behlendorf d6e2f4a455 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 16:42:01 -08:00
Brian Behlendorf 7001fd57fa Register sensible init/fini hooks 2009-01-09 16:38:13 -08:00
Brian Behlendorf 4530d592f8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 16:32:24 -08:00
Brian Behlendorf d9a45283ce Add ZFS load/unload console messages 2009-01-09 16:28:26 -08:00
Brian Behlendorf 3f70ee0f8a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 15:52:07 -08:00
Brian Behlendorf 1dc5e6d02e Remove HAVE_SPL should be HAVE_ZPL 2009-01-09 15:50:00 -08:00
Brian Behlendorf 2b195391ee Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 15:11:06 -08:00
Brian Behlendorf aa6c4ff685 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 15:10:59 -08:00
Brian Behlendorf 6791a1ee34 I don't think we need this in userspace 2009-01-09 15:07:32 -08:00
Brian Behlendorf 3f48c3fcd5 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 14:45:52 -08:00
Brian Behlendorf be3a17e437 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 14:45:45 -08:00
Brian Behlendorf ff09d64647 Pull all source in to be built, it will be ifdef'ed out as need by higher level topic branches 2009-01-09 14:37:45 -08:00
Brian Behlendorf b55164f2cb Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 14:18:33 -08:00
Brian Behlendorf 03a4aefbcf Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 14:18:25 -08:00
Brian Behlendorf 6b32aaea67 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-09 14:17:49 -08:00
Brian Behlendorf 86eb46d20b Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-09 14:17:49 -08:00
Brian Behlendorf 0e3bb44848 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-09 14:17:48 -08:00
Brian Behlendorf 578c9645df Merge branch 'gcc-c90' into refs/top-bases/gcc-branch 2009-01-09 14:17:48 -08:00
Brian Behlendorf 902ce659b0 Fix c90 compliance issue 2009-01-09 14:15:56 -08:00
Brian Behlendorf c7b309f9b1 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 13:33:55 -08:00
Brian Behlendorf bc5e2d8660 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-09 13:33:48 -08:00