Commit Graph

14175 Commits

Author SHA1 Message Date
Brian Behlendorf ae0cf6e572 Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2009-07-24 11:15:10 -07:00
Brian Behlendorf 9d80e40fbb Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2009-07-24 11:15:08 -07:00
Brian Behlendorf 53fe1acc41 Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch 2009-07-24 11:14:57 -07:00
Brian Behlendorf a9ffd4b53b Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol 2009-07-24 11:14:53 -07:00
Brian Behlendorf c55728cdae Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch 2009-07-24 11:14:44 -07:00
Brian Behlendorf 4d27030cca Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw 2009-07-24 11:14:42 -07:00
Brian Behlendorf 58accf61ab Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy 2009-07-24 11:14:41 -07:00
Brian Behlendorf 14bc4e1964 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2009-07-24 11:14:26 -07:00
Brian Behlendorf 03eba682e0 Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2009-07-24 11:14:24 -07:00
Brian Behlendorf 35cd8cd997 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2009-07-24 11:14:23 -07:00
Brian Behlendorf bdf6b39195 Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2009-07-24 11:14:05 -07:00
Brian Behlendorf 7069a52546 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2009-07-24 11:14:03 -07:00
Brian Behlendorf ad699b2abc Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2009-07-24 11:13:55 -07:00
Brian Behlendorf 9f0d45a1fa Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2009-07-24 11:13:53 -07:00
Brian Behlendorf 0545b5e03c Merge branch 'linux-have-libefi' into refs/top-bases/linux-zfs-branch 2009-07-24 11:13:44 -07:00
Brian Behlendorf 937dfea552 Merge commit 'refs/top-bases/linux-have-libefi' into linux-have-libefi 2009-07-24 11:13:42 -07:00
Brian Behlendorf 995427d395 Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch 2009-07-24 11:13:31 -07:00
Brian Behlendorf c1725fc2d2 Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt 2009-07-24 11:13:29 -07:00
Brian Behlendorf a76c4975aa Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2009-07-24 11:13:19 -07:00
Brian Behlendorf ed794b1078 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2009-07-24 11:13:17 -07:00
Brian Behlendorf 490a408971 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-07-24 11:13:08 -07:00
Brian Behlendorf 678618a6b1 Merge commit 'refs/top-bases/linux-docs' into linux-docs 2009-07-24 11:13:06 -07:00
Brian Behlendorf 430d6004e5 Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch
Conflicts:

	scripts/Makefile.am
2009-07-24 11:10:21 -07:00
Brian Behlendorf 25a102501e Merge commit 'refs/top-bases/linux-arc' into linux-arc 2009-07-24 11:08:44 -07:00
Brian Behlendorf db3967ba86 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-07-24 11:08:43 -07:00
Brian Behlendorf 9a2275c1c5 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2009-07-24 11:08:42 -07:00
Brian Behlendorf 77901ca759 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2009-07-24 11:08:41 -07:00
Brian Behlendorf 0435a79314 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2009-07-24 11:08:40 -07:00
Ricardo M. Correia 51760e3c7e Change VERIFY() into VERIFY3U() when creating threads in ztest, so that we can see the return code when it fails.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-07-24 11:00:23 -07:00
Ricardo M. Correia 08d148d418 Add ulimit -c unlimited before running ztest, to get a core dump.
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
2009-07-24 10:58:55 -07:00
Brian Behlendorf 63eac41313 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2009-07-24 10:37:10 -07:00
Brian Behlendorf 1df7ab7100 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2009-07-24 10:37:08 -07:00
Brian Behlendorf 100b497f16 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2009-07-24 10:36:56 -07:00
Brian Behlendorf 3ac5ac0f35 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2009-07-24 10:36:50 -07:00
Brian Behlendorf f80d037344 Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch 2009-07-24 10:36:42 -07:00
Brian Behlendorf e7aeda2035 Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl 2009-07-24 10:36:40 -07:00
Brian Behlendorf 9e97b9a64e Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2009-07-24 10:36:31 -07:00
Brian Behlendorf 121f6cf59e Merge commit 'refs/top-bases/linux-unused' into linux-unused 2009-07-24 10:36:29 -07:00
Brian Behlendorf 4293c75554 Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2009-07-24 10:36:16 -07:00
Brian Behlendorf 2d7b2e0107 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2009-07-24 10:36:14 -07:00
Brian Behlendorf bd8cf6e392 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2009-07-24 10:36:02 -07:00
Brian Behlendorf 08c9bcde74 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-07-24 10:36:00 -07:00
Brian Behlendorf 38df94fb8c Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2009-07-24 10:35:52 -07:00
Brian Behlendorf 5dbfe7f0a8 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2009-07-24 10:35:49 -07:00
Brian Behlendorf b49baa9a14 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2009-07-24 10:35:42 -07:00
Brian Behlendorf 9e85d01059 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2009-07-24 10:35:32 -07:00
Brian Behlendorf 78372f93e1 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2009-07-24 10:35:24 -07:00
Brian Behlendorf d7cafc2f4c Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2009-07-24 10:35:22 -07:00
Brian Behlendorf 5bd7603f1d Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2009-07-24 10:35:14 -07:00
Brian Behlendorf 50d6e87fed Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2009-07-24 10:35:12 -07:00