Brian Behlendorf
|
0cf4e1006a
|
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
|
2008-12-03 15:44:10 -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
|
2614a847b3
|
Merge commit 'refs/top-bases/feature-branch' into feature-branch
|
2008-12-03 12:47:55 -08:00 |
|
Brian Behlendorf
|
a0d3a74d7f
|
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
|
2008-12-03 12:47:54 -08:00 |
|
Brian Behlendorf
|
04cd3d24f9
|
New TopGit dependency: feature-zap-cursor-to-key
|
2008-12-03 12:47:52 -08:00 |
|
Brian Behlendorf
|
e24f5be337
|
Recreate feature-branch to simply feature merge
|
2008-12-03 12:47:38 -08:00 |
|
Brian Behlendorf
|
97aace11b3
|
Refresh feature-commit-cb to handle new context
|
2008-12-03 12:38:46 -08:00 |
|
Brian Behlendorf
|
5f10755521
|
Refreshed feature-zap-cursor-to-key to handle new context
|
2008-12-03 12:25:47 -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
|
be1242a56a
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-02 08:53:29 -08:00 |
|
Brian Behlendorf
|
33d4944e4d
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-02 08:53:18 -08:00 |
|
Brian Behlendorf
|
264f09c323
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-02 08:53:13 -08:00 |
|
Brian Behlendorf
|
22bf771aab
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-02 08:52:54 -08:00 |
|
Brian Behlendorf
|
56301526c2
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-02 08:52:43 -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
|
dd09dedb8b
|
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
|
2008-12-02 08:51:43 -08:00 |
|
Brian Behlendorf
|
8aa0cb97b5
|
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
|
2008-12-02 08:51:40 -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
|
9ac0ad5671
|
Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas
|
2008-12-01 16:18:09 -08:00 |
|
Brian Behlendorf
|
3a0c78f00a
|
Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case
|
2008-12-01 16:17:56 -08:00 |
|
Brian Behlendorf
|
3f0b1cf687
|
Merge commit 'refs/top-bases/gcc-c90' into gcc-c90
|
2008-12-01 16:17:50 -08:00 |
|
Brian Behlendorf
|
230f6c9223
|
Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit
|
2008-12-01 16:17:22 -08:00 |
|
Brian Behlendorf
|
15003316a0
|
Merge commit 'refs/top-bases/gcc-debug' into gcc-debug
|
2008-12-01 16:17:08 -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 |
|