Commit Graph

12311 Commits

Author SHA1 Message Date
Brian Behlendorf a41adac944 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-03-18 14:39:46 -07:00
Brian Behlendorf f56c17de6b Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-03-18 14:39:42 -07:00
Brian Behlendorf 5facd356c6 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-18 14:39:28 -07:00
Brian Behlendorf 23fe8f163e Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-03-18 14:39:26 -07:00
Brian Behlendorf 726b82d23d Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-18 14:39:10 -07:00
Brian Behlendorf b46037b53f Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-03-18 14:39:07 -07:00
Brian Behlendorf 88026ab3e6 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-03-18 14:38:50 -07:00
Brian Behlendorf c7cc10351e Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-03-18 14:38:48 -07:00
Brian Behlendorf 3303812c7a Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-03-18 14:38:28 -07:00
Brian Behlendorf 931cdd8858 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-03-18 14:38:25 -07:00
Brian Behlendorf cec23945d9 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-03-18 14:38:11 -07:00
Brian Behlendorf 6a714918fe Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-03-18 14:38:09 -07:00
Brian Behlendorf ae29c257b0 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-03-18 14:37:55 -07:00
Brian Behlendorf cfb3cd125c Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-03-18 14:37:52 -07:00
Brian Behlendorf 4d01333cd4 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-03-18 14:37:37 -07:00
Brian Behlendorf b4185ae90b Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-03-18 14:37:35 -07:00
Brian Behlendorf d2cea03c3f Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-03-18 14:37:20 -07:00
Brian Behlendorf e5a8f2a59e Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-03-18 14:37:18 -07:00
Brian Behlendorf a9d30cd9c4 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-03-18 14:36:35 -07:00
Brian Behlendorf 1f0547fce8 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-18 14:36:33 -07:00
Brian Behlendorf 3c699a3dc8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-18 14:36:31 -07:00
Brian Behlendorf 924d1c2e17 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-18 14:34:28 -07:00
Brian Behlendorf 551cfbc1f8 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-18 14:34:26 -07:00
Brian Behlendorf 5b5d766544 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-03-18 14:34:25 -07:00
Brian Behlendorf 9767afca2f Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-03-18 14:33:45 -07:00
Brian Behlendorf d836d91818 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-03-18 14:33:43 -07:00
Brian Behlendorf 84a1cd9dff Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-03-18 14:33:28 -07:00
Brian Behlendorf 20b47a7b23 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-03-18 14:33:25 -07:00
Brian Behlendorf eb5e67c99b Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-03-18 14:33:09 -07:00
Brian Behlendorf 3f05b34895 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-03-18 14:33:06 -07:00
Brian Behlendorf d1fb327103 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-03-18 14:32:49 -07:00
Brian Behlendorf c0a760420e Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-03-18 14:32:47 -07:00
Brian Behlendorf 7427f3d72c Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-03-18 14:32:31 -07:00
Brian Behlendorf 41c096d5a4 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-03-18 14:32:27 -07:00
Brian Behlendorf 01159f8903 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-03-18 14:32:11 -07:00
Brian Behlendorf 507bc2e8de Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-03-18 14:32:09 -07:00
Brian Behlendorf c6ddce0341 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-03-18 14:31:53 -07:00
Brian Behlendorf 8a4ad9df2d Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-03-18 14:31:50 -07:00
Brian Behlendorf 70407622a7 Move `make check` ztest under ./scripts where the module stack is loaded. 2009-03-18 14:19:04 -07:00
Brian Behlendorf e2212e6551 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-03-18 13:03:36 -07:00
Brian Behlendorf 920ba5bc5f Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-18 13:03:34 -07:00
Brian Behlendorf 28731591e8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-03-18 13:03:32 -07:00
Brian Behlendorf 6ca96b06b4 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-03-18 13:03:00 -07:00
Brian Behlendorf c96a13dbef Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-03-18 13:02:55 -07:00
Brian Behlendorf cc4fbf2c35 Revert to previous behavior zdb fails when unable to open /dev/zfs.
For the moment I have added an error message to the failure path to
make it clear what happened.  I have also changed the zdb ASSERT to
a VERIFY so we always catch the failure.  For now we will just always
ensure the module stack is loaded, longer term we need something a
little more flexible.
2009-03-18 12:48:54 -07:00
Brian Behlendorf 1c925dc4ce Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-03-17 16:33:47 -07:00
Brian Behlendorf 02424a268b Use spl_device_* macro's for portability. 2009-03-17 16:27:57 -07:00
Brian Behlendorf 9ce6adee54 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-03-17 16:07:04 -07:00
Brian Behlendorf 4379b0983e Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-03-17 16:07:03 -07:00
Brian Behlendorf 015c4a4deb Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-03-17 16:07:02 -07:00