Commit Graph

8308 Commits

Author SHA1 Message Date
Brian Behlendorf 56603384cf Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch 2009-01-13 11:56:31 -08:00
Brian Behlendorf 624c7073e7 Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-01-13 11:56:29 -08:00
Brian Behlendorf bba6e9829d Handle the case when 'module-name=' is passed down without args. This is handy and shouldn't generate warnings 2009-01-13 11:54:38 -08:00
Brian Behlendorf 6caf53f208 Minor script update 2009-01-13 11:53:51 -08:00
Brian Behlendorf 7461d1eb69 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-01-13 11:18:12 -08:00
Brian Behlendorf f15ef90618 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-13 11:18:11 -08:00
Brian Behlendorf 7356c2045e Update zpios.sh script to reference zfs not zpool, additionally remove unneed module load console message 2009-01-13 11:16:12 -08:00
Brian Behlendorf 6825690106 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-01-13 09:55:43 -08:00
Brian Behlendorf faeb9fd5b0 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-13 09:55:42 -08:00
Brian Behlendorf 7f9ce14e58 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-13 09:55:40 -08:00
Brian Behlendorf 5c1e30ef6f Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-13 09:55:37 -08:00
Brian Behlendorf ddb173d2b9 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-13 09:55:36 -08:00
Brian Behlendorf 6fb39a7c33 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-13 09:55:35 -08:00
Brian Behlendorf 09b6f64e2d Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-13 09:55:30 -08:00
Brian Behlendorf cae8f09ec5 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-13 09:55:27 -08:00
Brian Behlendorf ef6d827a88 Don't check HAVE_SPL unavailable in userspace build 2009-01-13 09:53:35 -08:00
Brian Behlendorf 3d6d118d90 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-01-09 16:54:19 -08:00
Brian Behlendorf 464874c029 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-09 16:54:18 -08:00
Brian Behlendorf a62a385848 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 16:54:15 -08:00
Brian Behlendorf 701a72aafb Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-09 16:54:08 -08:00
Brian Behlendorf 0093e81879 Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-09 16:54:05 -08:00
Brian Behlendorf ca328c5d30 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-09 16:54:04 -08:00
Brian Behlendorf 13ab1d30be Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-09 16:53:53 -08:00
Brian Behlendorf 58df2601b0 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-09 16:53:49 -08:00
Brian Behlendorf 3977cefecc Update load/unload message, mknod /dev/zfs when udev is unavailable 2009-01-09 16:50:28 -08:00
Brian Behlendorf e22bfeab4e Update load/unload message, mknod /dev/zfs when udev is unavailable 2009-01-09 16:50:08 -08:00
Brian Behlendorf 7547026c0b Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-01-09 16:42:17 -08:00
Brian Behlendorf 16f06e2ca9 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-09 16:42:15 -08:00
Brian Behlendorf 2250c070f8 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-09 16:42:12 -08:00
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 e35583aaa0 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-01-09 16:32:39 -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 4e42f2fd75 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-01-09 16:11:57 -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 bed9564e65 Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch 2009-01-09 15:57:22 -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