Commit Graph

4006 Commits

Author SHA1 Message Date
Brian Behlendorf cbfb5ce98b Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-28 10:15:23 -07:00
Brian Behlendorf 3450d1f3b5 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 10:14:43 -07:00
Brian Behlendorf af051f1250 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 10:14:43 -07:00
Brian Behlendorf 157df8338c Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch 2010-05-28 10:14:42 -07:00
Brian Behlendorf 32a6c32c9f Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-28 10:14:42 -07:00
Brian Behlendorf 9eec97e163 Revert fix-dsl_pool_t fixed upstream 2010-05-28 10:08:02 -07:00
Brian Behlendorf e0c3b03752 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-28 10:01:24 -07:00
Brian Behlendorf c2c3358a6f Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-28 10:00:44 -07:00
Brian Behlendorf 11510b3513 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-28 10:00:44 -07:00
Brian Behlendorf 396fb1e235 Merge branch 'fix-taskq' into refs/top-bases/fix-branch 2010-05-28 10:00:43 -07:00
Brian Behlendorf 9997b16134 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-28 10:00:43 -07:00
Brian Behlendorf 11a9bfc7f8 Revert fix-taskq changes reevaluate after update. 2010-05-28 09:54:03 -07:00
Brian Behlendorf 1c2ba9badb Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 20:06:49 -07:00
Brian Behlendorf e4d0d5c10c Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 20:06:10 -07:00
Brian Behlendorf 9644f95585 Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-27 20:06:10 -07:00
Brian Behlendorf be3f503d82 Remove fix-clock-wrap dependency from fix-branch 2010-05-27 19:59:32 -07:00
Brian Behlendorf e3f19ca711 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 17:02:56 -07:00
Brian Behlendorf 2fbe461b55 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 17:02:15 -07:00
Brian Behlendorf a7dcb2247a Merge branch 'fix-branch' into refs/top-bases/zfs-branch 2010-05-27 17:02:14 -07:00
Brian Behlendorf 03fdccb846 Merge commit 'refs/top-bases/fix-branch' into fix-branch 2010-05-27 17:02:14 -07:00
Brian Behlendorf 146ded4db2 Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch 2010-05-27 17:02:13 -07:00
Brian Behlendorf db069704ed Revert fix-clock-wrap fixed upstream
This was more or less fixed upstream.  Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.
2010-05-27 16:54:23 -07:00
Brian Behlendorf 3a3b13a80c Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 16:41:17 -07:00
Brian Behlendorf dcf4bc1e52 Re-remove feature-branch dependency. 2010-05-27 16:34:02 -07:00
Brian Behlendorf aa3b4e37ca Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 16:22:02 -07:00
Brian Behlendorf ea431b4dc6 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 16:14:04 -07:00
Brian Behlendorf 319f69734b Merge branch 'feature-branch' into refs/top-bases/zfs-branch
Conflicts:
	cmd/ztest/ztest.c
2010-05-27 16:13:19 -07:00
Brian Behlendorf 390995db28 Revert all remaining changes. 2010-05-27 14:25:06 -07:00
Brian Behlendorf 63fce783d6 Readd feature-branch to get the last of the reversions 2010-05-27 14:23:51 -07:00
Brian Behlendorf 983616fff7 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 14:20:31 -07:00
Brian Behlendorf 0e46276339 Remove feature-branch.
All but the pthreads changes have been committed upstream and in
the name of keeping the topgit tree as simple as possible I'm removing
the entire 'feature' subtree.  The pthreads changes are now a 'fix'.
2010-05-27 14:17:51 -07:00
Brian Behlendorf 4421661601 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 14:15:18 -07:00
Brian Behlendorf b265da19f0 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 14:15:08 -07:00
Brian Behlendorf 3a7896c8d2 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 14:15:08 -07:00
Brian Behlendorf c7742fd698 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-27 14:15:07 -07:00
Brian Behlendorf 5c16b9898b Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch 2010-05-27 14:15:07 -07:00
Brian Behlendorf b754295dec Revert feature-zap-cursor-to-key feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 14:12:59 -07:00
Brian Behlendorf 38f5286432 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 13:57:26 -07:00
Brian Behlendorf 249ae381e1 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:57:16 -07:00
Brian Behlendorf 59104b4325 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 13:57:16 -07:00
Brian Behlendorf 262c747b4c Remove feature-pthreads topic branch 2010-05-27 13:54:07 -07:00
Brian Behlendorf ec12bc1f02 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 13:51:48 -07:00
Brian Behlendorf d8e5eb56b8 Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:42:00 -07:00
Brian Behlendorf 028e42b692 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-05-27 13:42:00 -07:00
Brian Behlendorf cde6e6fec8 Merge commit 'refs/top-bases/feature-branch' into feature-branch 2010-05-27 13:40:15 -07:00
Brian Behlendorf 1dc4235011 Merge branch 'feature-pthreads' into refs/top-bases/feature-branch 2010-05-27 13:40:14 -07:00
Brian Behlendorf ca50214549 Merge commit 'refs/top-bases/feature-pthreads' into feature-pthreads 2010-05-27 13:40:14 -07:00
Brian Behlendorf 1e32b3c781 Revert feature-commit-cb feature upstream
We can drop this feature and we will pick up the lastest version
during the b141 update.
2010-05-27 13:39:17 -07:00
Brian Behlendorf 37679a13f1 Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions 2010-05-27 13:35:54 -07:00
Brian Behlendorf c17d3e05eb Merge branch 'feature-branch' into refs/top-bases/zfs-branch 2010-05-27 13:32:58 -07:00