Commit Graph

8964 Commits

Author SHA1 Message Date
Brian Behlendorf 5814105f6f Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-09 16:42:05 -08:00
Brian Behlendorf 3122996061 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 16:42:02 -08:00
Brian Behlendorf d6e2f4a455 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 16:42:01 -08:00
Brian Behlendorf bd06c6eb0e Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 16:41:50 -08:00
Brian Behlendorf cd56628b75 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 16:41:46 -08:00
Brian Behlendorf 7001fd57fa Register sensible init/fini hooks 2009-01-09 16:38:13 -08:00
Brian Behlendorf cd11e9a87d Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-09 16:32:38 -08:00
Brian Behlendorf f3a2522a14 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 16:32:36 -08:00
Brian Behlendorf 0d83c580d5 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-09 16:32:29 -08:00
Brian Behlendorf 91f6492ef5 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 16:32:26 -08:00
Brian Behlendorf 4530d592f8 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 16:32:24 -08:00
Brian Behlendorf 1ccec67674 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 16:32:13 -08:00
Brian Behlendorf b19ccd10af Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 16:32:09 -08:00
Brian Behlendorf d9a45283ce Add ZFS load/unload console messages 2009-01-09 16:28:26 -08:00
Brian Behlendorf 598a2f5f4d Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-09 16:11:55 -08:00
Brian Behlendorf 2f2ae376e8 ifdef out some zvol specific ioctls 2009-01-09 16:08:18 -08:00
Brian Behlendorf 1cf2f6a63e Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-09 15:57:21 -08:00
Brian Behlendorf 1475f7234b Make the ZPL only bits conditional 2009-01-09 15:55:19 -08:00
Brian Behlendorf d0936f4502 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-09 15:52:14 -08:00
Brian Behlendorf 1d1886b5f9 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 15:52:13 -08:00
Brian Behlendorf 0e335764f0 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-09 15:52:09 -08:00
Brian Behlendorf c0f45a99fc Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 15:52:08 -08:00
Brian Behlendorf 3f70ee0f8a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 15:52:07 -08:00
Brian Behlendorf 2148f8256b Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 15:52:02 -08:00
Brian Behlendorf ca3acc4f50 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 15:52:00 -08:00
Brian Behlendorf 1dc5e6d02e Remove HAVE_SPL should be HAVE_ZPL 2009-01-09 15:50:00 -08:00
Brian Behlendorf ca48ebe083 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-09 15:36:18 -08:00
Brian Behlendorf f2b69bd921 Fix 2 more instances on XDR encoding which is not yet supported, us native encode 2009-01-09 15:34:32 -08:00
Brian Behlendorf 8f4340d3e8 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:58 -08:00
Brian Behlendorf 402405558a Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-09 15:11:56 -08:00
Brian Behlendorf 5c530132fc Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:53 -08:00
Brian Behlendorf 3a9ed52a6c Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-09 15:11:52 -08:00
Brian Behlendorf 1c0f4043a3 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:49 -08:00
Brian Behlendorf b8fc1110d1 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-09 15:11:48 -08:00
Brian Behlendorf 8752ad0406 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:44 -08:00
Brian Behlendorf 58f4a5a125 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-09 15:11:43 -08:00
Brian Behlendorf a387a34087 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:40 -08:00
Brian Behlendorf fce16fe818 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-09 15:11:38 -08:00
Brian Behlendorf 5430001be9 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:35 -08:00
Brian Behlendorf ade2433834 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-09 15:11:34 -08:00
Brian Behlendorf 1bf31ae438 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:31 -08:00
Brian Behlendorf d2d018fafa Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-09 15:11:29 -08:00
Brian Behlendorf e6d67668e9 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:26 -08:00
Brian Behlendorf 1fd9167bc0 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-09 15:11:25 -08:00
Brian Behlendorf a4beae4c4b Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:21 -08:00
Brian Behlendorf 3061758c0d Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-09 15:11:20 -08:00
Brian Behlendorf f885b5dc1c Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:17 -08:00
Brian Behlendorf e86fa83ee6 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-09 15:11:16 -08:00
Brian Behlendorf 7c4463c898 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-09 15:11:12 -08:00
Brian Behlendorf 89cf8c8a67 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 15:11:11 -08:00