Brian Behlendorf
|
edd4013797
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-03 16:55:41 -08:00 |
|
Brian Behlendorf
|
95bc12dae2
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2008-12-03 16:55:41 -08:00 |
|
Brian Behlendorf
|
93353cff74
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2008-12-03 16:55:33 -08:00 |
|
Brian Behlendorf
|
6113c6468a
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-03 16:55:32 -08:00 |
|
Brian Behlendorf
|
45293dbdd2
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2008-12-03 16:55:23 -08:00 |
|
Brian Behlendorf
|
9a5374658d
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-03 16:55:22 -08:00 |
|
Brian Behlendorf
|
53b2172d24
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2008-12-03 16:55:12 -08:00 |
|
Brian Behlendorf
|
b39f8cfa48
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-03 16:55:11 -08:00 |
|
Brian Behlendorf
|
c48cf16fe6
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-03 16:47:10 -08:00 |
|
Brian Behlendorf
|
d04d66d1c7
|
Refreshed patch for newer upstream context
|
2008-12-03 16:28:35 -08:00 |
|
Brian Behlendorf
|
f3ee1c7591
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-12-03 16:19:11 -08:00 |
|
Brian Behlendorf
|
c05d222824
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-03 16:18:50 -08:00 |
|
Brian Behlendorf
|
7bc74ea3c7
|
Refreshed fix-pthreads based on upstream changes
|
2008-12-03 16:18:02 -08:00 |
|
Brian Behlendorf
|
96072c88e2
|
Add userspace zfs_context file
|
2008-12-03 15:43:56 -08:00 |
|
Brian Behlendorf
|
25a6bc4ffd
|
Update fix no zmod to handle context:
|
2008-12-03 13:31:00 -08:00 |
|
Brian Behlendorf
|
abfcf9e532
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-03 12:55:30 -08:00 |
|
Brian Behlendorf
|
b981a3ab4b
|
spa->spa_zio_cv dropped in upstream source, update fix-locks patch accordingly
|
2008-12-03 12:54:50 -08:00 |
|
Brian Behlendorf
|
3d58032e16
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-03 12:51:06 -08:00 |
|
Brian Behlendorf
|
e5db6312c8
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-03 12:50:46 -08:00 |
|
Brian Behlendorf
|
4ad630c929
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-03 12:50:24 -08:00 |
|
Brian Behlendorf
|
20e50e3a5e
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-03 12:50:02 -08:00 |
|
Brian Behlendorf
|
afe9e56ab0
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-03 12:49:26 -08:00 |
|
Brian Behlendorf
|
4acf46e211
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-03 12:48:42 -08:00 |
|
Brian Behlendorf
|
b128c09fbe
|
Rebase to OpenSolaris b103, in the process we are removing any code which did not originate from the OpenSolaris source. These changes will be reintroduced in topic branches for easier tracking
|
2008-12-03 12:09:06 -08:00 |
|
Brian Behlendorf
|
a1af337250
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-12-02 08:52:31 -08:00 |
|
Brian Behlendorf
|
82528f38ae
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-12-02 08:52:25 -08:00 |
|
Brian Behlendorf
|
d5295e451f
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-02 08:52:22 -08:00 |
|
Brian Behlendorf
|
6fd279437d
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-02 08:52:19 -08:00 |
|
Brian Behlendorf
|
75898ec634
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-02 08:52:15 -08:00 |
|
Brian Behlendorf
|
98edc51a2b
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-02 08:52:09 -08:00 |
|
Brian Behlendorf
|
ac510492da
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-02 08:52:06 -08:00 |
|
Brian Behlendorf
|
16d980efb4
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-02 08:52:03 -08:00 |
|
Brian Behlendorf
|
12d6a5b7dc
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-02 08:52:00 -08:00 |
|
Brian Behlendorf
|
a5c8544c51
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-02 08:51:57 -08:00 |
|
Brian Behlendorf
|
1977158193
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-02 08:51:54 -08:00 |
|
Brian Behlendorf
|
b6097ae55a
|
Remove stray stub kernel files which should be brought in my linux-kernel-module patch
|
2008-12-02 08:47:21 -08:00 |
|
Brian Behlendorf
|
4464244677
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-12-01 16:16:53 -08:00 |
|
Brian Behlendorf
|
68760ef209
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-12-01 16:16:46 -08:00 |
|
Brian Behlendorf
|
7d9abfa754
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-01 16:16:43 -08:00 |
|
Brian Behlendorf
|
60ca0f5b90
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-01 16:16:40 -08:00 |
|
Brian Behlendorf
|
761eedf029
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-01 16:16:37 -08:00 |
|
Brian Behlendorf
|
64abe5d8f1
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-01 16:16:29 -08:00 |
|
Brian Behlendorf
|
87a62ac3e4
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-01 16:16:25 -08:00 |
|
Brian Behlendorf
|
3aad9321bc
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-01 16:16:22 -08:00 |
|
Brian Behlendorf
|
9875431a9f
|
Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks
|
2008-12-01 16:16:18 -08:00 |
|
Brian Behlendorf
|
0d8d373bc4
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-01 16:16:14 -08:00 |
|
Brian Behlendorf
|
c7310e8f0e
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-01 16:16:09 -08:00 |
|
Brian Behlendorf
|
7ebbc0c799
|
Finish removing all non-upstream bits from master
|
2008-12-01 16:15:29 -08:00 |
|
Brian Behlendorf
|
63c49fa982
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-12-01 15:56:16 -08:00 |
|
Brian Behlendorf
|
4a805e2768
|
Merge commit 'refs/top-bases/fix-stack' into fix-stack
|
2008-12-01 15:56:12 -08:00 |