Commit Graph

9989 Commits

Author SHA1 Message Date
Brian Behlendorf 1962107ffd Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-21 11:29:35 -08:00
Brian Behlendorf 84f00fdeb0 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-21 11:29:33 -08:00
Brian Behlendorf e3c19e6036 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-21 11:29:30 -08:00
Brian Behlendorf a44f4aab6a Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-21 11:29:28 -08:00
Brian Behlendorf 682f704a0f Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-21 11:29:25 -08:00
Brian Behlendorf 7dbcb90d26 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-21 11:29:23 -08:00
Brian Behlendorf 701810dc6f Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-21 11:29:20 -08:00
Brian Behlendorf 47802f4afc Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-21 11:29:18 -08:00
Brian Behlendorf 4cee20b087 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-21 11:29:17 -08:00
Brian Behlendorf 675cdc2ef6 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-21 11:29:12 -08:00
Brian Behlendorf 5389080071 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-21 11:29:10 -08:00
Brian Behlendorf ef39ff845b Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-01-21 11:29:10 -08:00
Brian Behlendorf fb6e5d4e77 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-01-21 11:29:04 -08:00
Brian Behlendorf ba4bbe2511 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-01-21 11:29:02 -08:00
Brian Behlendorf af444bf9db Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-01-21 11:28:58 -08:00
Brian Behlendorf 45a09b9b5e Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-01-21 11:28:56 -08:00
Brian Behlendorf b1e680c49d Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-01-21 11:28:53 -08:00
Brian Behlendorf 7bd3fbad05 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-01-21 11:28:51 -08:00
Brian Behlendorf 4c18632f88 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-01-21 11:28:48 -08:00
Brian Behlendorf cd761bad0c Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-01-21 11:28:46 -08:00
Brian Behlendorf 967f7d930d Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-01-21 11:28:43 -08:00
Brian Behlendorf 2673285038 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-01-21 11:28:41 -08:00
Brian Behlendorf 5faa68f541 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-01-21 11:28:37 -08:00
Brian Behlendorf 3b80be0d53 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-01-21 11:28:36 -08:00
Brian Behlendorf a8f294fadc Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-21 11:28:32 -08:00
Brian Behlendorf e208467b02 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-21 11:28:26 -08:00
Brian Behlendorf 5d233af2da Add TODO 2009-01-21 11:26:19 -08:00
Brian Behlendorf 92dce85827 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-21 11:02:12 -08:00
Brian Behlendorf ab8f4ca43f Convert ASSERT() to VERIFY() for better coverage 2009-01-21 10:59:06 -08:00
Brian Behlendorf 6cd9c36b39 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-01-20 21:38:29 -08:00
Brian Behlendorf afda731ea0 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-01-20 21:38:27 -08:00
Brian Behlendorf a15304da32 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-20 21:38:24 -08:00
Brian Behlendorf 02bffd7277 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-20 21:38:22 -08:00
Brian Behlendorf b1a047da64 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-20 21:38:19 -08:00
Brian Behlendorf 939752d33a Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-20 21:38:17 -08:00
Brian Behlendorf c9bf782ebd Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-20 21:38:14 -08:00
Brian Behlendorf c43174e8fb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-20 21:38:12 -08:00
Brian Behlendorf 8d42d28dbc Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-20 21:38:09 -08:00
Brian Behlendorf 28dd8ef8b9 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-20 21:38:07 -08:00
Brian Behlendorf 443cc50d81 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-20 21:38:04 -08:00
Brian Behlendorf 598d454618 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-20 21:38:02 -08:00
Brian Behlendorf 85791a1843 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-20 21:37:58 -08:00
Brian Behlendorf 4b814bb20d Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-20 21:37:57 -08:00
Brian Behlendorf fcbcf65e57 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-20 21:37:53 -08:00
Brian Behlendorf 2252ed24a6 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-20 21:37:52 -08:00
Brian Behlendorf ca14e326c4 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-20 21:37:48 -08:00
Brian Behlendorf 871cd0d7ba Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-20 21:37:46 -08:00
Brian Behlendorf a719574ca0 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-20 21:37:43 -08:00
Brian Behlendorf f2347f40d1 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-20 21:37:41 -08:00
Brian Behlendorf 4846abc984 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-20 21:37:38 -08:00