Commit Graph

2044 Commits

Author SHA1 Message Date
Brian Behlendorf d35eb45584 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 16:41:55 -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 3b2986c053 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 16:32:18 -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
Brian Behlendorf 6953ccc7fd Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 16:30:28 -08:00
Brian Behlendorf a6152094d0 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 16:30:27 -08:00
Brian Behlendorf dee065ca8d Use pthread versions 2008-12-22 16:26:23 -08:00
Brian Behlendorf 50735743b7 Err undo that 2008-12-22 16:22:28 -08:00
Brian Behlendorf bb128e51e6 Use thread so we can add other goodies beyond simply the pthread base 2008-12-22 16:20:36 -08:00
Brian Behlendorf 6a394806f5 Prototype fixes 2008-12-22 16:18:07 -08:00
Brian Behlendorf 1d092e0490 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 16:07:29 -08:00
Brian Behlendorf ef7fd1aa08 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 16:07:28 -08:00
Brian Behlendorf f0d3cb50d3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 16:07:11 -08:00
Brian Behlendorf 419cff0fd3 Add more more missing headers 2008-12-22 16:02:08 -08:00
Brian Behlendorf dede01fb36 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 15:52:03 -08:00
Brian Behlendorf f22f5d3250 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 15:52:02 -08:00
Brian Behlendorf 9ee7fa3dbd Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 15:51:54 -08:00
Brian Behlendorf d56b3c2440 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2008-12-22 15:51:14 -08:00
Brian Behlendorf 720f34ffbe Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 15:51:14 -08:00
Brian Behlendorf 70045f227b Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 15:51:13 -08:00
Brian Behlendorf 4c48a5484d Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 15:51:12 -08:00
Brian Behlendorf f58a0bf4ec Remove now unneeded verify 2008-12-22 15:49:13 -08:00
Brian Behlendorf 67a52f2701 Add more missing include paths 2008-12-22 15:48:05 -08:00
Brian Behlendorf f320d16e09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 15:37:01 -08:00
Brian Behlendorf 8d8a79961a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 15:37:00 -08:00
Brian Behlendorf 7b4a4ef1f3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 15:36:52 -08:00
Brian Behlendorf 27dd5bca77 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-22 15:36:15 -08:00
Brian Behlendorf dfddd3290c Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 15:36:14 -08:00
Brian Behlendorf 1f19965f10 Merge branch 'gcc-branch' into refs/top-bases/zfs-branch 2008-12-22 15:36:14 -08:00
Brian Behlendorf 262c2c49c1 Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch 2008-12-22 15:36:13 -08:00
Brian Behlendorf 088c5451b7 Add missing include 2008-12-22 15:34:18 -08:00
Brian Behlendorf 9b3b373d4f Fix prototypes, why not invalid persay. They use the traditional pre-standard form and were depricated as of C99 2008-12-22 15:33:15 -08:00
Brian Behlendorf 858142b6a0 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 14:44:50 -08:00
Brian Behlendorf 86205f8531 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 14:44:49 -08:00
Brian Behlendorf 16d3bec487 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2008-12-22 14:44:42 -08:00
Brian Behlendorf 29b47d366e Remove some headers 2008-12-22 14:42:02 -08:00
Brian Behlendorf 8f69262e09 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 13:52:06 -08:00
Brian Behlendorf c93aec7f64 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 13:52:05 -08:00