157df8338c
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-05-28 10:14:42 -07:00
9eec97e163
Revert fix-dsl_pool_t fixed upstream
2010-05-28 10:08:02 -07:00
396fb1e235
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-05-28 10:00:43 -07:00
11a9bfc7f8
Revert fix-taskq changes reevaluate after update.
2010-05-28 09:54:03 -07:00
146ded4db2
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-05-27 17:02:13 -07:00
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
1587b4b366
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-05-18 15:01:03 -07:00
923e1bad7f
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-05-18 15:01:02 -07:00
a050659724
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-05-18 15:01:02 -07:00
56abf9a10f
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-05-18 15:01:01 -07:00
8b7b401717
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-05-18 15:01:00 -07:00
13493e3166
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-05-18 15:01:00 -07:00
3666b263e0
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-05-18 15:00:59 -07:00
4ee7b37f0b
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-05-18 15:00:59 -07:00
fa53553fc1
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-05-18 15:00:58 -07:00
202285d64a
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-05-18 15:00:57 -07:00
46c73e7b7a
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-05-18 15:00:57 -07:00
d476e932ac
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-05-18 15:00:56 -07:00
4903c7d0e9
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-05-18 15:00:55 -07:00
c670bcacc4
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-05-18 15:00:55 -07:00
9a13227b89
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-05-18 15:00:54 -07:00
e3dccb9279
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-05-18 15:00:54 -07:00
77b455afe7
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-05-18 15:00:53 -07:00
f017b5e433
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-05-18 15:00:53 -07:00
2be44c5dd7
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-05-18 15:00:52 -07:00
f24e2bcaf8
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-05-18 15:00:51 -07:00
6430461823
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-05-18 15:00:51 -07:00
027dccc808
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2010-05-18 15:00:50 -07:00
b29650b928
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-05-18 15:00:49 -07:00
bca9497a1c
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-05-18 15:00:49 -07:00
238324940d
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2010-05-18 15:00:48 -07:00
1a23010b0f
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
2010-05-18 15:00:48 -07:00
083ebb73e6
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-05-18 15:00:47 -07:00
42f4fe5178
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2010-05-18 15:00:47 -07:00
c0a13a0870
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2010-05-18 15:00:46 -07:00
349ffff391
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
2010-05-18 15:00:45 -07:00
08465a2ab4
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2010-05-18 15:00:45 -07:00
1e8fbfb2e6
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2010-05-18 15:00:44 -07:00
6119cb885a
Add AUTHORS to master branch
2010-05-18 14:55:01 -07:00
bac43a5ed8
Merge branch 'fix-error-handling' into refs/top-bases/fix-branch
2010-05-18 14:33:32 -07:00
0c8ffbd097
Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling
2010-05-18 14:33:31 -07:00
2a15dc5a26
Merge branch 'fix-acl' into refs/top-bases/fix-branch
2010-05-18 14:33:31 -07:00
6083ba2858
Merge commit 'refs/top-bases/fix-acl' into fix-acl
2010-05-18 14:33:30 -07:00
c1fea7027d
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-05-18 14:33:29 -07:00
8d98096d9a
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-05-18 14:33:29 -07:00
a0dc4d2b32
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-05-18 14:33:28 -07:00
ad992ca19f
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-05-18 14:33:28 -07:00
344f6d47a1
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-05-18 14:33:27 -07:00
a818b49bf4
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-05-18 14:33:27 -07:00
8a532d2a64
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-05-18 14:33:26 -07:00
Brian Behlendorf