Commit Graph

1860 Commits

Author SHA1 Message Date
Brian Behlendorf 1796d8a800 Merge branch 'gcc-cast' into refs/top-bases/gcc-branch 2009-01-05 11:11:06 -08:00
Brian Behlendorf 9fd00aa162 Merge commit 'refs/top-bases/gcc-cast' into gcc-cast 2009-01-05 11:11:05 -08:00
Brian Behlendorf 148d093b76 Remove zdump.c 2009-01-05 11:11:02 -08:00
Brian Behlendorf 1ed474aa0d Merge commit 'refs/top-bases/gcc-c90' into gcc-c90 2009-01-05 11:10:31 -08:00
Brian Behlendorf 36b849fa51 Remove zdump, it's an unrelateds command which I added simply due to the z* command convention 2009-01-05 11:10:13 -08:00
Brian Behlendorf 6b88c17a8f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 13:49:54 -08:00
Brian Behlendorf 39953e7eb3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 13:49:47 -08:00
Brian Behlendorf de6b729e33 Add Makefile tweak 2008-12-23 13:44:15 -08:00
Brian Behlendorf 4177b4715d Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 13:13:37 -08:00
Brian Behlendorf f49886c003 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 13:13:29 -08:00
Brian Behlendorf 7725fe7431 Remove CPU_SEQID from context, available in SPL. Additionally add module magic for zcommon 2008-12-23 13:11:03 -08:00
Brian Behlendorf e7e0111a7c Update makefile 2008-12-23 13:07:27 -08:00
Brian Behlendorf 9b3e361b6e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 12:51:06 -08:00
Brian Behlendorf c22ff325ce Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 12:50:58 -08:00
Brian Behlendorf 0dfd5ebee8 module/zcommon/Makefile.in 2008-12-23 12:47:03 -08:00
Brian Behlendorf 8209bef3af Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 11:50:05 -08:00
Brian Behlendorf 82cd3659a2 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 11:49:58 -08:00
Brian Behlendorf 5a0a9cc451 Update makefiles 2008-12-23 11:47:33 -08:00
Brian Behlendorf 561a603c4a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 11:27:26 -08:00
Brian Behlendorf e669dbace6 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 11:27:19 -08:00
Brian Behlendorf 8c549cdfd6 Add MODDIR directory 2008-12-23 11:06:08 -08:00
Brian Behlendorf 9b2d46c38e Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-23 10:17:32 -08:00
Brian Behlendorf 22beb7d41c Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-23 10:17:25 -08:00
Brian Behlendorf 4a8619da5f Add module build targets 2008-12-23 10:13:07 -08:00
Brian Behlendorf 125e96faba Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 16:57:16 -08:00
Brian Behlendorf cf964c715e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 16:57:04 -08:00
Brian Behlendorf fdffe91056 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:55:59 -08:00
Brian Behlendorf 0844495710 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:55:58 -08:00
Brian Behlendorf 76a831e0af Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 16:55:56 -08:00
Brian Behlendorf f6c152354f Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 16:55:55 -08:00
Brian Behlendorf f3d55cb4f5 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 16:55:52 -08:00
Brian Behlendorf 0b6064c023 Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 16:55:51 -08:00
Brian Behlendorf 30b961af2c Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 16:55:50 -08:00
Brian Behlendorf 3a76148338 Add a needed lib 2008-12-22 16:52:26 -08:00
Brian Behlendorf 9ef0280a5c Use pthread_ 2008-12-22 16:51:28 -08:00
Brian Behlendorf 683f0b1d6c Fix cast 2008-12-22 16:50:44 -08:00
Brian Behlendorf f225784236 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 16:41:54 -08:00
Brian Behlendorf 195ee69c7f Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 16:41:40 -08:00
Brian Behlendorf 44f75e4f86 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:40:35 -08:00
Brian Behlendorf e8e738e3b9 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:40:34 -08:00
Brian Behlendorf 9f2908cfb5 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 16:40:32 -08:00
Brian Behlendorf 01414a8906 Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 16:40:31 -08:00
Brian Behlendorf f016a8e15f Update patch carried forward from old release 2008-12-22 16:35:36 -08:00
Brian Behlendorf 62e33a9103 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 16:32:16 -08:00
Brian Behlendorf 7ed0d3813e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 16:31:59 -08:00
Brian Behlendorf 36c5ea8174 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 16:30:37 -08:00
Brian Behlendorf 43abce68c5 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 16:30:35 -08:00
Brian Behlendorf f5f002d923 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 16:30:33 -08:00
Brian Behlendorf 153cb8337b Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 16:30:32 -08:00
Brian Behlendorf 8ab0586445 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 16:30:29 -08:00