Commit Graph

6503 Commits

Author SHA1 Message Date
Brian Behlendorf c1f980b230 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2008-12-22 11:08:10 -08:00
Brian Behlendorf 3798ffbd65 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2008-12-22 11:08:09 -08:00
Brian Behlendorf cbf2123a21 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2008-12-22 11:08:06 -08:00
Brian Behlendorf 92ed0cf21a Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2008-12-22 11:08:04 -08:00
Brian Behlendorf 3cef774b48 Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2008-12-22 11:08:01 -08:00
Brian Behlendorf 247ad2d25c Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2008-12-22 11:07:59 -08:00
Brian Behlendorf fd4b094ee2 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2008-12-22 11:07:56 -08:00
Brian Behlendorf 6a30f2f297 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2008-12-22 11:07:55 -08:00
Brian Behlendorf 5d25a8e12a Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2008-12-22 11:07:51 -08:00
Brian Behlendorf 6d3458f57f Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2008-12-22 11:07:50 -08:00
Brian Behlendorf 1855cd8ccf Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2008-12-22 11:07:47 -08:00
Brian Behlendorf 32317b2e94 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2008-12-22 11:07:45 -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 f39d01f037 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2008-12-22 11:07:40 -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 03a0383581 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2008-12-22 11:07:38 -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 3c7b37a02c Merge branch 'fix-pthreads' into refs/top-bases/fix-branch 2008-12-22 11:07:37 -08:00
Brian Behlendorf 94c9beaefb Merge commit 'refs/top-bases/gcc-branch' into gcc-branch 2008-12-22 11:07:35 -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 09de417e20 Move #endif up to expose userspace bits 2008-12-22 11:01:35 -08:00
Brian Behlendorf 4bf318d0a8 Add needed libs 2008-12-22 11:00:47 -08:00
Brian Behlendorf 799faa7ab6 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:48 -08:00
Brian Behlendorf 735f99cbcb Merge commit 'refs/top-bases/linux-unused' into linux-unused 2008-12-22 10:37:47 -08:00
Brian Behlendorf 01dee27561 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:44 -08:00
Brian Behlendorf 4e564d755b Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2008-12-22 10:37:42 -08:00
Brian Behlendorf ffa61d72da Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:39 -08:00
Brian Behlendorf c73c225a4a Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-22 10:37:37 -08:00
Brian Behlendorf 24f7e6dc1c Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:34 -08:00
Brian Behlendorf 7e800d8125 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2008-12-22 10:37:33 -08:00
Brian Behlendorf 8ab8b43b5b Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:30 -08:00
Brian Behlendorf 1bfbc7e5ba Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2008-12-22 10:37:28 -08:00
Brian Behlendorf fc4520ef6b Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:25 -08:00
Brian Behlendorf 7e1406dd6c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2008-12-22 10:37:24 -08:00
Brian Behlendorf 3b9583ccca Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:21 -08:00
Brian Behlendorf edaabab594 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2008-12-22 10:37:19 -08:00
Brian Behlendorf e94d1d3d98 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:16 -08:00
Brian Behlendorf 8126ebe55f Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2008-12-22 10:37:14 -08:00
Brian Behlendorf 0054f831be Merge branch 'linux-ioctl' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:11 -08:00
Brian Behlendorf 8ad9104988 Merge commit 'refs/top-bases/linux-ioctl' into linux-ioctl 2008-12-22 10:37:10 -08:00
Brian Behlendorf 136e3c09b8 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:06 -08:00
Brian Behlendorf 5169758856 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2008-12-22 10:37:05 -08:00
Brian Behlendorf 97cd0e7932 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2008-12-22 10:37:02 -08:00
Brian Behlendorf c6e93310af Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2008-12-22 10:37:00 -08:00
Brian Behlendorf 1491547e84 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2008-12-22 10:36:57 -08:00
Brian Behlendorf ba2c349faf Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2008-12-22 10:36:56 -08:00
Brian Behlendorf e0141c82aa Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2008-12-22 10:36:55 -08:00