Brian Behlendorf
|
95bc12dae2
|
Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch
|
2008-12-03 16:55:41 -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
|
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
|
96072c88e2
|
Add userspace zfs_context file
|
2008-12-03 15:43:56 -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
|
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
|
16d980efb4
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-02 08:52:03 -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
|
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
|
3aad9321bc
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-01 16:16:22 -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
|
9a90adb9bb
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-12-01 15:56:10 -08:00 |
|
Brian Behlendorf
|
95f9285e2f
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-12-01 15:56:08 -08:00 |
|
Brian Behlendorf
|
f65b548331
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-12-01 15:56:06 -08:00 |
|
Brian Behlendorf
|
e24dd552fb
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-12-01 15:55:57 -08:00 |
|
Brian Behlendorf
|
24fca97809
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-12-01 15:55:50 -08:00 |
|
Brian Behlendorf
|
ef76e2f5ea
|
Removed build system from master branch, will relocate to linux-zfs-branch
|
2008-12-01 15:41:33 -08:00 |
|
Brian Behlendorf
|
42baae9615
|
Removed build system from master branch, will relocate to linux-zfs-branch
|
2008-12-01 15:38:41 -08:00 |
|
Brian Behlendorf
|
fe441a9050
|
Relocate COPYING+COPYRIGHT, remove README cruft
|
2008-12-01 15:34:53 -08:00 |
|
Brian Behlendorf
|
ef2e1711d2
|
Add CDDL license file
|
2008-12-01 14:49:34 -08:00 |
|
Brian Behlendorf
|
c216ecf2d2
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-11-26 15:50:38 -08:00 |
|
Brian Behlendorf
|
a25f9f9927
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-11-26 15:50:36 -08:00 |
|
Brian Behlendorf
|
088785db0e
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-11-26 15:50:35 -08:00 |
|
Brian Behlendorf
|
4100434c78
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-11-26 15:50:29 -08:00 |
|
Brian Behlendorf
|
b9a35345b8
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-11-26 15:50:24 -08:00 |
|
Brian Behlendorf
|
100eb88b46
|
Update zpios for trivial workload
|
2008-11-26 15:48:14 -08:00 |
|
Brian Behlendorf
|
62b0592588
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-11-26 15:34:59 -08:00 |
|
Brian Behlendorf
|
522f084a3a
|
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
|
2008-11-26 15:34:57 -08:00 |
|
Brian Behlendorf
|
348e04f47e
|
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
|
2008-11-26 15:34:55 -08:00 |
|
Brian Behlendorf
|
ccaf3cea52
|
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
|
2008-11-26 15:34:49 -08:00 |
|
Brian Behlendorf
|
f6af8074c0
|
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
|
2008-11-26 15:34:44 -08:00 |
|
Brian Behlendorf
|
62b749c8c8
|
Working version of M4 macro config
|
2008-11-26 15:32:39 -08:00 |
|
Brian Behlendorf
|
02e1a88a59
|
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
|
2008-11-26 14:32:11 -08:00 |