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
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
e8610745f3
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-12-01 15:55:59 -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
3b5b736ba5
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-01 15:55:53 -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
0a72f8b7a3
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-11-26 15:50:30 -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
55c689cc3c
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-11-26 15:50:26 -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
25432a7642
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-11-26 15:34:50 -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
f57ef9a5db
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-11-26 15:34:45 -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
Brian Behlendorf
ab4892b584
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-11-26 14:32:09 -08:00
Brian Behlendorf
8fea40da95
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 14:32:08 -08:00
Brian Behlendorf
f24d3b3ca0
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-11-26 14:32:03 -08:00
Brian Behlendorf
4a7490b7b7
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2008-11-26 14:32:01 -08:00
Brian Behlendorf
68613b3e36
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-11-26 14:31:58 -08:00
Brian Behlendorf
1086f98938
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 14:31:56 -08:00
Brian Behlendorf
f0e648ca02
Make everything a M4 macro, it's just cleaner that way
2008-11-26 14:29:45 -08:00
Brian Behlendorf
0be952ac1d
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2008-11-26 14:09:36 -08:00
Brian Behlendorf
4450fa4cd3
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-11-26 14:09:35 -08:00
Brian Behlendorf
5557421e2d
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 14:09:33 -08:00
Brian Behlendorf
d27f062434
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-11-26 14:09:28 -08:00
Brian Behlendorf
b16bda161c
Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs
2008-11-26 14:09:27 -08:00
Brian Behlendorf
5c2337d37a
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-11-26 14:09:23 -08:00
Brian Behlendorf
dbf2e667e6
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 14:09:22 -08:00
Brian Behlendorf
e833fd4a5c
Additional buidl system cleanup. Starting to move all
...
of the kernel specific build info in to config/kernel,
likewise and user specific build flags should go in
config/user. This seems like a reasonable way to go.
2008-11-26 14:06:23 -08:00
Brian Behlendorf
4c11cdbfe4
Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t
2008-11-26 13:31:04 -08:00
Brian Behlendorf
23cd5ea273
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-11-26 13:31:03 -08:00
Brian Behlendorf
ece1bcb3ef
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 13:31:01 -08:00
Brian Behlendorf
5c75fe725c
Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs
2008-11-26 13:30:57 -08:00