Commit Graph

2082 Commits

Author SHA1 Message Date
Brian Behlendorf 2f36bf5af4 Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis 2009-01-15 14:05:29 -08:00
Brian Behlendorf 35a269c06c Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case 2009-01-15 14:05:26 -08:00
Brian Behlendorf ec49b066ba Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch 2009-01-15 14:05:26 -08:00
Brian Behlendorf ffd9fa6bf1 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2009-01-15 14:05:24 -08:00
Brian Behlendorf 86e39f5e3b Resolve conflict with removed cleaner type 2009-01-15 14:05:21 -08:00
Brian Behlendorf a54285e83e Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch 2009-01-15 14:04:46 -08:00
Brian Behlendorf 4adbf673d2 Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas 2009-01-15 14:04:45 -08:00
Brian Behlendorf 8aa8457e3e Merge branch 'gcc-debug' into refs/top-bases/gcc-branch 2009-01-15 14:04:43 -08:00
Brian Behlendorf 0f68134272 Merge commit 'refs/top-bases/gcc-debug' into gcc-debug 2009-01-15 14:04:42 -08:00
Brian Behlendorf 9140c1af89 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-01-15 14:04:40 -08:00
Brian Behlendorf a2e601c6e3 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-15 14:04:39 -08:00
Brian Behlendorf 3fa768e21b Resolve conflict with removed cleaner type 2009-01-15 14:04:35 -08:00
Brian Behlendorf d3df6b2012 Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-15 14:01:51 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf 07d76bbadd Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-15 10:17:20 -08:00
Brian Behlendorf 2e7dccee5f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-15 10:17:12 -08:00
Brian Behlendorf 6932f09bb5 Reference module not modules in SPL for consistency 2009-01-15 10:14:21 -08:00
Brian Behlendorf 9a54db7edf Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-14 15:43:51 -08:00
Brian Behlendorf 390146458e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-14 15:43:43 -08:00
Brian Behlendorf 9c22d76019 Minor 'make check' updates 2009-01-14 15:38:56 -08:00
Brian Behlendorf 2b32a0752f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-14 14:27:36 -08:00
Brian Behlendorf 4fdb04d0a1 A little hackery to handle using zdb when the module stack isn't loaded. This is a hack and should be addressed upstream, zdb should not be attempting to initialize services it doesn't need 2009-01-14 14:25:25 -08:00
Brian Behlendorf d730906f9b Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-14 13:46:16 -08:00
Brian Behlendorf 9beccacec1 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-14 13:46:09 -08:00
Brian Behlendorf 095c83db71 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-14 13:45:31 -08:00
Brian Behlendorf 1c54d0d15d Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-14 13:45:31 -08:00
Brian Behlendorf d1e802ec14 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-14 13:45:30 -08:00
Brian Behlendorf a7e8d5a15a Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-14 13:45:30 -08:00
Brian Behlendorf d443f1ae05 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2009-01-14 13:45:28 -08:00
Brian Behlendorf 99d075d922 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2009-01-14 13:45:28 -08:00
Brian Behlendorf 06b00a5951 Merge branch 'gcc-unused' into refs/top-bases/gcc-branch 2009-01-14 13:45:27 -08:00
Brian Behlendorf 3e7127371a Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch 2009-01-14 13:45:27 -08:00
Brian Behlendorf f2c3f362c1 Update topmsg 2009-01-14 13:42:08 -08:00
Brian Behlendorf 57f204f6fd Update topmsg 2009-01-14 13:41:56 -08:00
Brian Behlendorf 95576ca7a8 Update topmsg 2009-01-14 13:41:28 -08:00
Brian Behlendorf b874e980f9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-14 13:32:39 -08:00
Brian Behlendorf c0edd1f948 Remove unneeded header 2009-01-14 13:30:32 -08:00
Brian Behlendorf 04443d2d7a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-14 08:42:19 -08:00
Brian Behlendorf f63f4dd2cd Remove unneeded chunk, create a FS the real way with an ioctl 2009-01-14 08:26:09 -08:00
Brian Behlendorf 97f656ab18 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 16:08:02 -08:00
Brian Behlendorf fce0143a40 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 16:07:45 -08:00
Brian Behlendorf 04d7ae5f22 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 16:06:28 -08:00
Brian Behlendorf c186f81c6d Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 16:06:26 -08:00
Brian Behlendorf fe0f26150a Merge commit 'refs/top-bases/fix-branch' into fix-branch 2009-01-13 16:06:24 -08:00
Brian Behlendorf e1632568f1 Merge branch 'fix-list' into refs/top-bases/fix-branch 2009-01-13 16:06:23 -08:00
Brian Behlendorf be0b4029db Initialize list links 2009-01-13 16:02:19 -08:00
Brian Behlendorf 9cccf52448 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 15:34:46 -08:00
Brian Behlendorf c3335290e2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-13 15:34:38 -08:00
Brian Behlendorf 32baeb1712 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-01-13 15:34:01 -08:00
Brian Behlendorf 0d6b81fcca Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2009-01-13 15:34:00 -08:00