Commit Graph

8307 Commits

Author SHA1 Message Date
Brian Behlendorf e6b22a9a3e Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-14 13:32:46 -08:00
Brian Behlendorf 8b1bccfddf Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-14 13:32:44 -08:00
Brian Behlendorf 2a4ab8a095 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-14 13:32:41 -08:00
Brian Behlendorf 1b6bc0866d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-14 13:32:40 -08:00
Brian Behlendorf b874e980f9 Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-14 13:32:39 -08:00
Brian Behlendorf 904640e3c7 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-14 13:32:33 -08:00
Brian Behlendorf fb941c67fa Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-14 13:32:31 -08:00
Brian Behlendorf c0edd1f948 Remove unneeded header 2009-01-14 13:30:32 -08:00
Brian Behlendorf e6746c2609 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-14 12:06:41 -08:00
Brian Behlendorf 3764ec0e1e Fixed sizeof() issue and minor cleanup 2009-01-14 12:03:03 -08:00
Brian Behlendorf 97073208f8 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-14 10:42:45 -08:00
Brian Behlendorf 7d01bcf8b4 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-14 10:42:44 -08:00
Brian Behlendorf e090338e7b Update zpios script 2009-01-14 10:40:50 -08:00
Brian Behlendorf bdde0d9d40 Return success here not failure 2009-01-14 10:37:35 -08:00
Brian Behlendorf a0d6a6fced Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-14 10:01:11 -08:00
Brian Behlendorf bbd8816aff Add missing echo 2009-01-14 09:59:10 -08:00
Brian Behlendorf 4b621b279d Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-14 09:20:11 -08:00
Brian Behlendorf b0bf494b37 Refresh script to handle errors (missing stat files) more gracefully, additionally lengthen the default test to a useful length 2009-01-14 09:18:16 -08:00
Brian Behlendorf 50832652c2 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-14 08:42:33 -08:00
Brian Behlendorf 1f353e52f6 Merge branch 'linux-have-xdr' into refs/top-bases/linux-zfs-branch 2009-01-14 08:42:32 -08:00
Brian Behlendorf 03f6a88536 Merge commit 'refs/top-bases/linux-have-xdr' into linux-have-xdr 2009-01-14 08:42:29 -08:00
Brian Behlendorf a677f7cba9 Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-01-14 08:42:24 -08:00
Brian Behlendorf 926ec0657d Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-01-14 08:42:21 -08:00
Brian Behlendorf 04443d2d7a Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-01-14 08:42:19 -08:00
Brian Behlendorf ad1dde3678 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-01-14 08:42:11 -08:00
Brian Behlendorf b8ca971861 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-01-14 08:42:00 -08:00
Brian Behlendorf 1194e0412f Change all instances of kpios to zpios 2009-01-14 08:38:35 -08:00
Brian Behlendorf f63f4dd2cd Remove unneeded chunk, create a FS the real way with an ioctl 2009-01-14 08:26:09 -08:00
Brian Behlendorf 4497cfb321 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-13 16:49:26 -08:00
Brian Behlendorf 9ab30b2e96 Use zpios not kpios for referce 2009-01-13 16:42:21 -08:00
Brian Behlendorf b39462cdff Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-01-13 16:10:05 -08:00
Brian Behlendorf 7423bcfe2a Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-01-13 16:10:01 -08:00
Brian Behlendorf e274bb15c1 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-01-13 16:09:54 -08:00
Brian Behlendorf 6b4efd1194 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-01-13 16:09:50 -08:00
Brian Behlendorf 3f128d0436 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-01-13 16:09:43 -08:00
Brian Behlendorf 401aac51fb Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-01-13 16:09:40 -08:00
Brian Behlendorf 474ce677d7 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-01-13 16:09:31 -08:00
Brian Behlendorf 7635d14cd1 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-01-13 16:09:27 -08:00
Brian Behlendorf eed856bb54 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-01-13 16:09:20 -08:00
Brian Behlendorf 6942c0a989 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-01-13 16:09:16 -08:00
Brian Behlendorf 8a91d804d7 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-01-13 16:09:09 -08:00
Brian Behlendorf 5b86949716 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-01-13 16:09:05 -08:00
Brian Behlendorf 7347b35b70 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-01-13 16:08:58 -08:00
Brian Behlendorf d176f1e6a3 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-01-13 16:08:54 -08:00
Brian Behlendorf 1f94d158dc Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-01-13 16:08:47 -08:00
Brian Behlendorf fd3adc8f0a Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-01-13 16:08:43 -08:00
Brian Behlendorf 2054d17ee4 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-01-13 16:08:36 -08:00
Brian Behlendorf 2dac6d5542 Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-01-13 16:08:32 -08:00
Brian Behlendorf 8c7162bec7 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-01-13 16:08:26 -08:00
Brian Behlendorf df809b8ca1 Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-01-13 16:08:23 -08:00