683c459a72
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-05-28 13:54:53 -07:00
0f28de26db
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
2010-05-28 13:54:52 -07:00
2b40ca1456
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-05-28 13:54:52 -07:00
6c1f1ca76b
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
...
Conflicts:
lib/libzfs/libzfs_sendrecv.c
2010-05-28 13:54:49 -07:00
0c7850b688
Merge branch 'fix-list' into refs/top-bases/fix-branch
2010-05-28 13:54:13 -07:00
c53061c5af
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
2010-05-28 13:54:12 -07:00
016808b9e9
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-05-28 13:54:12 -07:00
2c67a5a29d
Merge commit 'refs/top-bases/fix-taskq' into fix-taskq
2010-05-28 13:54:12 -07:00
4bcccd352e
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-05-28 13:54:11 -07:00
89089d1e4b
Merge commit 'refs/top-bases/fix-stack' into fix-stack
...
Conflicts:
module/zfs/dmu_objset.c
module/zfs/spa_history.c
2010-05-28 13:54:08 -07:00
be688941e5
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-05-28 13:52:55 -07:00
0d4d1a7861
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
...
Conflicts:
module/zfs/dsl_dataset.c
2010-05-28 13:52:52 -07:00
0c6ebd6b14
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
2010-05-28 13:52:29 -07:00
39f5f90c1a
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-05-28 13:52:29 -07:00
0a7f819adf
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
2010-05-28 13:52:28 -07:00
141b42bae9
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
2010-05-28 13:52:28 -07:00
24fc842bea
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
2010-05-28 13:52:28 -07:00
64420d9573
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2010-05-28 13:52:27 -07:00
d9e977d23b
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2010-05-28 13:52:27 -07:00
1a55aa78e7
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
...
Conflicts:
module/zfs/dnode.c
2010-05-28 13:52:23 -07:00
31630287ca
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
...
Conflicts:
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dsl_dataset.c
module/zfs/spa_history.c
2010-05-28 13:51:29 -07:00
ab1a68b225
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
...
Conflicts:
module/zfs/dnode_sync.c
2010-05-28 13:46:45 -07:00
428870ff73
Update core ZFS code from build 121 to build 141.
2010-05-28 13:45:14 -07:00
fcfae8fbee
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
2010-05-28 12:20:30 -07:00
c37d6443a4
Revert fix-get-configs should no longer be needed
2010-05-28 12:18:45 -07:00
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
13493e3166
Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode
2010-05-18 15:01:00 -07:00
8b7b401717
Merge branch 'fix-deadcode' into refs/top-bases/fix-branch
2010-05-18 15:01:00 -07:00
4ee7b37f0b
Merge commit 'refs/top-bases/fix-strncat' into fix-strncat
2010-05-18 15:00:59 -07:00
3666b263e0
Merge branch 'fix-strncat' into refs/top-bases/fix-branch
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
46c73e7b7a
Merge commit 'refs/top-bases/fix-list' into fix-list
2010-05-18 15:00:57 -07:00
202285d64a
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
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
c670bcacc4
Merge commit 'refs/top-bases/fix-stack' into fix-stack
2010-05-18 15:00:55 -07:00
4903c7d0e9
Merge branch 'fix-stack' into refs/top-bases/fix-branch
2010-05-18 15:00:55 -07:00
e3dccb9279
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
2010-05-18 15:00:54 -07:00
9a13227b89
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
2010-05-18 15:00:54 -07:00
f017b5e433
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
2010-05-18 15:00:53 -07:00
77b455afe7
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
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
Brian Behlendorf