45293dbdd2
Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch
2008-12-03 16:55:23 -08:00
9a5374658d
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-03 16:55:22 -08:00
53b2172d24
Merge branch 'fix-dbuf_dirty_record_t' into refs/top-bases/fix-branch
2008-12-03 16:55:12 -08:00
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
c48cf16fe6
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-03 16:47:10 -08:00
96072c88e2
Add userspace zfs_context file
2008-12-03 15:43:56 -08:00
20e50e3a5e
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-03 12:50:02 -08:00
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
4acf46e211
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-03 12:48:42 -08:00
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
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
75898ec634
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-02 08:52:15 -08:00
1977158193
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-02 08:51:54 -08:00
b6097ae55a
Remove stray stub kernel files which should be brought in my linux-kernel-module patch
2008-12-02 08:47:21 -08:00
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
761eedf029
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-01 16:16:37 -08:00
c7310e8f0e
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-01 16:16:09 -08:00
7ebbc0c799
Finish removing all non-upstream bits from master
2008-12-01 16:15:29 -08:00
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
f65b548331
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-12-01 15:56:06 -08:00
24fca97809
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-12-01 15:55:50 -08:00
ef76e2f5ea
Removed build system from master branch, will relocate to linux-zfs-branch
2008-12-01 15:41:33 -08:00
42baae9615
Removed build system from master branch, will relocate to linux-zfs-branch
2008-12-01 15:38:41 -08:00
fe441a9050
Relocate COPYING+COPYRIGHT, remove README cruft
2008-12-01 15:34:53 -08:00
ef2e1711d2
Add CDDL license file
2008-12-01 14:49:34 -08:00
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
088785db0e
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 15:50:35 -08:00
b9a35345b8
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 15:50:24 -08:00
100eb88b46
Update zpios for trivial workload
2008-11-26 15:48:14 -08:00
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
348e04f47e
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 15:34:55 -08:00
f6af8074c0
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 15:34:44 -08:00
62b749c8c8
Working version of M4 macro config
2008-11-26 15:32:39 -08:00
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
8fea40da95
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 14:32:08 -08:00
1086f98938
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 14:31:56 -08:00
f0e648ca02
Make everything a M4 macro, it's just cleaner that way
2008-11-26 14:29:45 -08:00
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
5557421e2d
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 14:09:33 -08:00
dbf2e667e6
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 14:09:22 -08:00
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
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
ece1bcb3ef
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 13:31:01 -08:00
432daf67b3
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 13:30:51 -08:00
dbceaca71d
Prefix META_ALIAS with ZFS_
2008-11-26 13:28:44 -08:00
bb43036568
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-11-26 13:14:13 -08:00
5ea9df34f0
Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons
2008-11-26 13:14:12 -08:00
4574b7a27a
Merge commit 'refs/top-bases/fix-clock-wrap' into fix-clock-wrap
2008-11-26 13:14:00 -08:00
cb9c044bf6
Add SPL prefix to META_* #defines
2008-11-26 13:11:33 -08:00
6eb4a74450
Merge commit 'refs/top-bases/fix-dbuf_dirty_record_t' into fix-dbuf_dirty_record_t
2008-11-26 12:56:13 -08:00
Brian Behlendorf