Commit Graph

14667 Commits

Author SHA1 Message Date
Brian Behlendorf 71fc3afa47 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-17 21:45:25 -07:00
Brian Behlendorf 129c873ecd Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-17 21:45:15 -07:00
Brian Behlendorf c18866f1dc Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-17 21:45:05 -07:00
Brian Behlendorf 4f10caa09f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-17 21:44:56 -07:00
Brian Behlendorf 6b6275de0f Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-17 21:44:55 -07:00
Brian Behlendorf 57639d4629 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-17 21:44:39 -07:00
Brian Behlendorf f4622dcf3e Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-08-17 21:44:38 -07:00
Brian Behlendorf cb0dfc1d05 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-08-17 21:44:22 -07:00
Brian Behlendorf af5134e564 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-08-17 21:44:12 -07:00
Brian Behlendorf 4f3003ea5c Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-17 21:44:03 -07:00
Brian Behlendorf ddba690873 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-08-17 21:43:53 -07:00
Brian Behlendorf b2e3e3d2fd Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-08-17 21:43:44 -07:00
Brian Behlendorf a0c7fb482c Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-08-17 21:40:53 -07:00
Brian Behlendorf 4f555da51d Add zfs-test package which includes test infrastructure.
This change extends the existing in-tree test infrastructure such
that it can also be run as part of a the installed package.  This
simplifies testing on multiple systems and is generally all around
useful.  The scripts may still be run in-tree and will use the
in-tree build products as long as .script-config exists.
2009-08-17 21:35:06 -07:00
Brian Behlendorf 48c403e16f Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-08-14 16:29:14 -07:00
Brian Behlendorf d4dbc9b95a Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-08-14 16:29:13 -07:00
Brian Behlendorf fdab4fc223 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-08-14 16:29:07 -07:00
Brian Behlendorf 69c6b20c65 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-08-14 16:29:05 -07:00
Brian Behlendorf 77a0a06813 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-08-14 16:29:00 -07:00
Brian Behlendorf 46c745e747 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-08-14 16:28:58 -07:00
Brian Behlendorf 86be2b6db8 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-08-14 16:28:52 -07:00
Brian Behlendorf 536c791cf4 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-08-14 16:28:50 -07:00
Brian Behlendorf 865deb6d4c Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-08-14 16:28:45 -07:00
Brian Behlendorf 6067b66286 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-08-14 16:28:43 -07:00
Brian Behlendorf 66b1175242 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-08-14 16:28:38 -07:00
Brian Behlendorf db226491b1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-08-14 16:28:36 -07:00
Brian Behlendorf 3d1fcf35f6 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-08-14 16:28:30 -07:00
Brian Behlendorf 40624c07d0 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-08-14 16:28:29 -07:00
Brian Behlendorf 0d8be3d79e Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-08-14 16:28:23 -07:00
Brian Behlendorf c2b056a4d7 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-08-14 16:28:21 -07:00
Brian Behlendorf be39dadfb5 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-08-14 16:28:16 -07:00
Brian Behlendorf b1a3dc7777 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-08-14 16:28:14 -07:00
Brian Behlendorf 20213dd6d6 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-08-14 16:28:09 -07:00
Brian Behlendorf 8fe5b9062b Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-08-14 16:28:07 -07:00
Brian Behlendorf b6edc5c841 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-08-14 16:28:02 -07:00
Brian Behlendorf 32dabf5d24 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-08-14 16:28:00 -07:00
Brian Behlendorf 907d739b58 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-08-14 16:27:55 -07:00
Brian Behlendorf 10b124d62d Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-08-14 16:27:53 -07:00
Brian Behlendorf 9f261770b2 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-08-14 16:27:47 -07:00
Brian Behlendorf 6195d5f714 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-08-14 16:27:46 -07:00
Brian Behlendorf 38eb79e939 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-08-14 16:27:45 -07:00
Brian Behlendorf 97d125763b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-08-14 16:27:35 -07:00
Brian Behlendorf 6201b22b50 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-08-14 16:27:34 -07:00
Brian Behlendorf de4d7e0cb5 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-08-14 16:27:33 -07:00
Brian Behlendorf e824f8baee Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-08-14 16:27:23 -07:00
Brian Behlendorf f09d4f93c6 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-08-14 16:27:21 -07:00
Brian Behlendorf 64e1712b97 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-08-14 16:27:16 -07:00
Brian Behlendorf 4de8f39e3f Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-08-14 16:27:14 -07:00
Brian Behlendorf c7673c8c1d Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-08-14 16:27:09 -07:00
Brian Behlendorf 8d000a388e Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-08-14 16:27:07 -07:00