Commit Graph

16779 Commits

Author SHA1 Message Date
Brian Behlendorf 05d1b12449 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-03-09 12:31:54 -08:00
Brian Behlendorf 469d330632 Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-03-09 12:31:52 -08:00
Brian Behlendorf 9702889ff5 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-03-09 12:31:47 -08:00
Brian Behlendorf 41844740dc Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-03-09 12:31:46 -08:00
Brian Behlendorf 5f1fd09e78 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-03-09 12:31:41 -08:00
Brian Behlendorf ceba75045d Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-03-09 12:31:39 -08:00
Brian Behlendorf 33007de25e Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-03-09 12:31:34 -08:00
Brian Behlendorf fdab6de381 Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-03-09 12:31:32 -08:00
Brian Behlendorf d6ecdf97d0 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-03-09 12:31:26 -08:00
Brian Behlendorf 3ea63f0cdb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-09 12:31:25 -08:00
Brian Behlendorf b2281d842e Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-03-09 12:31:20 -08:00
Brian Behlendorf 4b2b113239 Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-09 12:31:18 -08:00
Brian Behlendorf dab4501bf7 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-03-09 12:31:13 -08:00
Brian Behlendorf bd96142642 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-03-09 12:31:11 -08:00
Brian Behlendorf f0275e3a4b Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2010-03-09 12:31:06 -08:00
Brian Behlendorf d9f3a394cb Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2010-03-09 12:31:04 -08:00
Brian Behlendorf 0bd2bcab99 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-03-09 12:31:00 -08:00
Brian Behlendorf eda82c813d Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-09 12:30:57 -08:00
Brian Behlendorf 5319cdefbd Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch 2010-03-09 12:30:52 -08:00
Brian Behlendorf 3ea409cfce Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk 2010-03-09 12:30:50 -08:00
Brian Behlendorf b0bcf222b9 Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch 2010-03-09 12:30:45 -08:00
Brian Behlendorf feac56bf5a Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent 2010-03-09 12:30:44 -08:00
Brian Behlendorf 17a96f44f3 Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module 2010-03-09 12:30:43 -08:00
Brian Behlendorf f5fbbbbd7e Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch 2010-03-09 12:30:34 -08:00
Brian Behlendorf ca6b87c127 Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug 2010-03-09 12:30:32 -08:00
Brian Behlendorf cd5f471e2c Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-03-09 12:30:28 -08:00
Brian Behlendorf 30668cb769 Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent 2010-03-09 12:30:26 -08:00
Brian Behlendorf 573328741b Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch 2010-03-09 12:30:21 -08:00
Brian Behlendorf 324bb92af5 Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm 2010-03-09 12:30:19 -08:00
Brian Behlendorf 8f63d438cd Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-03-09 12:30:18 -08:00
Brian Behlendorf 48e74ed68b Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:

	cmd/ztest/ztest.c
2010-03-09 12:30:03 -08:00
Brian Behlendorf 9a3d5378c6 Clean up emulation of kernel threads in userspace.
Updated to use pthread thread specific data rather than keeping
a global list.  This also fixes at least one easily reproducible
crash in ztest
2010-03-09 12:25:28 -08:00
Brian Behlendorf b56a453c68 Merge branch 'linux-have-idmap' into refs/top-bases/linux-zfs-branch 2010-03-09 10:32:02 -08:00
Brian Behlendorf 63220bc50d Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap 2010-03-09 10:32:00 -08:00
Brian Behlendorf 7a5893a148 Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch 2010-03-09 10:31:55 -08:00
Brian Behlendorf 31ad373507 Merge commit 'refs/top-bases/linux-ztest' into linux-ztest 2010-03-09 10:31:54 -08:00
Brian Behlendorf ad2f21ae79 Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 2010-03-09 10:31:49 -08:00
Brian Behlendorf 792a63a7a6 Merge commit 'refs/top-bases/linux-unused' into linux-unused 2010-03-09 10:31:47 -08:00
Brian Behlendorf ddf5c4723a Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch 2010-03-09 10:31:42 -08:00
Brian Behlendorf 842b08cc3f Merge commit 'refs/top-bases/linux-libspl' into linux-libspl 2010-03-09 10:31:41 -08:00
Brian Behlendorf daa4742df9 Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch 2010-03-09 10:31:35 -08:00
Brian Behlendorf 49f514aabb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-09 10:31:33 -08:00
Brian Behlendorf 796afe2a80 Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch 2010-03-09 10:31:28 -08:00
Brian Behlendorf 41516067cf Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk 2010-03-09 10:31:26 -08:00
Brian Behlendorf 7b95f791f7 Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch 2010-03-09 10:31:21 -08:00
Brian Behlendorf 96904978f8 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-03-09 10:31:19 -08:00
Brian Behlendorf fc9e816d54 Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch 2010-03-09 10:31:14 -08:00
Brian Behlendorf f3df9d18d8 Merge commit 'refs/top-bases/linux-legacy' into linux-legacy 2010-03-09 10:31:12 -08:00
Brian Behlendorf 244f858c77 Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch 2010-03-09 10:31:07 -08:00
Brian Behlendorf 4d0e16b4a8 Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem 2010-03-09 10:31:05 -08:00