Brian Behlendorf
f1e299054c
Merge commit 'refs/top-bases/fix-branch' into fix-branch
2010-05-28 12:20:30 -07:00
Brian Behlendorf
c37d6443a4
Revert fix-get-configs should no longer be needed
2010-05-28 12:18:45 -07:00
Brian Behlendorf
9bdd83fed1
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-28 10:26:03 -07:00
Brian Behlendorf
3c2eb55c13
Merge commit 'refs/top-bases/zfs-branch' into zfs-branch
2010-05-28 10:24:56 -07:00
Brian Behlendorf
ad342f9c21
Merge branch 'fix-branch' into refs/top-bases/zfs-branch
2010-05-28 10:24:56 -07:00
Brian Behlendorf
a5e72e009e
Remove fix-dsl_pool_t dependency from fix-branch
2010-05-28 10:18:41 -07:00
Brian Behlendorf
a8c31cc57e
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-28 10:15:53 -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
c4bab1b240
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-28 10:01:55 -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
59e699ca45
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 20:07:18 -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
2c43eeb7ec
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 17:03:27 -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
89a80898c6
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 16:41:47 -07:00
Brian Behlendorf
dcf4bc1e52
Re-remove feature-branch dependency.
2010-05-27 16:34:02 -07:00
Brian Behlendorf
9a0a10e569
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 16:22:34 -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
3f8590a9fc
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 14:20:38 -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
d56dd05097
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 14:15:25 -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
16453f7a3f
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 13:57:34 -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
a400748253
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2010-05-27 13:51:56 -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