Brian Behlendorf
|
ea1f2cfe39
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-08 16:25:08 -08:00 |
|
Brian Behlendorf
|
fd93a0e836
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2008-12-08 16:25:06 -08:00 |
|
Brian Behlendorf
|
f59db25d22
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-08 16:25:05 -08:00 |
|
Brian Behlendorf
|
6dc3c910d0
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-08 16:25:03 -08:00 |
|
Brian Behlendorf
|
610e18567c
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2008-12-08 16:25:03 -08:00 |
|
Brian Behlendorf
|
ac65d3cb2c
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2008-12-08 16:25:00 -08:00 |
|
Brian Behlendorf
|
71764cf835
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-08 16:24:59 -08:00 |
|
Brian Behlendorf
|
7a7ab04309
|
Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch
|
2008-12-08 16:24:57 -08:00 |
|
Brian Behlendorf
|
157b4baf7d
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-08 16:24:56 -08:00 |
|
Brian Behlendorf
|
2ce583f663
|
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
|
2008-12-08 16:24:55 -08:00 |
|
Brian Behlendorf
|
f6fae9da07
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-08 16:24:54 -08:00 |
|
Brian Behlendorf
|
ffc6d01e92
|
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
|
2008-12-08 16:24:52 -08:00 |
|
Brian Behlendorf
|
5410d492e1
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-08 16:24:51 -08:00 |
|
Brian Behlendorf
|
6f2c9f9634
|
Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch
|
2008-12-08 16:24:49 -08:00 |
|
Brian Behlendorf
|
2f826e10c1
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-08 16:24:48 -08:00 |
|
Brian Behlendorf
|
2b67f51fb6
|
Attempt move of kernel.c with topgit
|
2008-12-08 16:20:25 -08:00 |
|
Brian Behlendorf
|
84b88863cb
|
Merge branch 'fix-taskq' into refs/top-bases/fix-branch
|
2008-12-03 16:56:53 -08:00 |
|
Brian Behlendorf
|
3934fa5796
|
Merge branch 'fix-stack' into refs/top-bases/fix-branch
|
2008-12-03 16:56:44 -08:00 |
|
Brian Behlendorf
|
8b02fed645
|
Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch
|
2008-12-03 16:56:35 -08:00 |
|
Brian Behlendorf
|
13c9056431
|
Merge branch 'fix-pthreads' into refs/top-bases/fix-branch
|
2008-12-03 16:56:28 -08:00 |
|
Brian Behlendorf
|
509faf8d6e
|
Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch
|
2008-12-03 16:56:22 -08:00 |
|
Brian Behlendorf
|
094c415cc7
|
Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod
|
2008-12-03 16:56:21 -08:00 |
|
Brian Behlendorf
|
1d26394d2d
|
Merge commit 'refs/top-bases/fix-newlines' into fix-newlines
|
2008-12-03 16:56:10 -08:00 |
|
Brian Behlendorf
|
189f60fb23
|
Merge branch 'fix-newlines' into refs/top-bases/fix-branch
|
2008-12-03 16:56:10 -08:00 |
|
Brian Behlendorf
|
25b568c651
|
Merge branch 'fix-locks' into refs/top-bases/fix-branch
|
2008-12-03 16:56:01 -08:00 |
|
Brian Behlendorf
|
a01917a91d
|
Merge commit 'refs/top-bases/fix-locks' into fix-locks
|
2008-12-03 16:56:00 -08:00 |
|
Brian Behlendorf
|
8f14acd0ba
|
Merge branch 'fix-get-configs' into refs/top-bases/fix-branch
|
2008-12-03 16:55:50 -08:00 |
|
Brian Behlendorf
|
7ee15c26a4
|
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
|
2008-12-03 16:55:49 -08:00 |
|
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 |