Brian Behlendorf
240084a033
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-12 13:46:54 -08:00
Brian Behlendorf
810db7e0a2
Remove zcommon reference merged in to zpool
2008-12-12 13:41:20 -08:00
Brian Behlendorf
a557668285
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 15:41:49 -08:00
Brian Behlendorf
6b2c60acca
Moving lib/libspl to linux-libspl branch
2008-12-11 15:38:59 -08:00
Brian Behlendorf
208f59182a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 14:25:28 -08:00
Brian Behlendorf
a4076c7544
Script updates
2008-12-11 14:21:14 -08:00
Brian Behlendorf
c4911ece24
Move library files to lib
2008-12-11 14:16:55 -08:00
Brian Behlendorf
e152d6e601
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-11 11:27:10 -08:00
Brian Behlendorf
b453b61272
Fix libspl move to the wrong place
2008-12-11 11:22:02 -08:00
Brian Behlendorf
4b7ee081ce
Fix typo
2008-12-11 11:16:38 -08:00
Brian Behlendorf
77755a5771
Add a few missing files
2008-12-11 11:14:49 -08:00
Brian Behlendorf
172bb4bd5e
Move the world out of /zfs/ and seperate out module build tree
2008-12-11 11:08:09 -08:00
Brian Behlendorf
7e2cf12ae4
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-10 12:46:09 -08:00
Brian Behlendorf
9e8b1e836c
Remove libumem, we will try and remove this dependency entirely. If we can't then the best move will simply be to use the official library, or build it as a convenience library
2008-12-10 12:43:20 -08:00
Brian Behlendorf
8795b4a264
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-09 14:16:36 -08:00
Brian Behlendorf
5e97ed8493
Move vmem* to libumem
2008-12-09 14:14:00 -08:00
Brian Behlendorf
e727920ebd
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-09 13:40:59 -08:00
Brian Behlendorf
48343be6a3
Temporarily move taskq+util to libzpool until that directory is broken in to lib+module
2008-12-09 13:32:01 -08:00
Brian Behlendorf
ea2522dd60
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-08 16:46:43 -08:00
Brian Behlendorf
2f40ac4d9e
Minor tweak to update script
2008-12-08 16:38:46 -08:00
Brian Behlendorf
c3cd0a9715
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-08 16:25:29 -08:00
Brian Behlendorf
2b67f51fb6
Attempt move of kernel.c with topgit
2008-12-08 16:20:25 -08:00
Brian Behlendorf
4d579da99f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
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
97aace11b3
Refresh feature-commit-cb to handle new context
2008-12-03 12:38:46 -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
dd09dedb8b
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-02 08:51:43 -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
ff8c81a61f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-01 16:15:58 -08:00
Brian Behlendorf
7ebbc0c799
Finish removing all non-upstream bits from master
2008-12-01 16:15:29 -08:00
Brian Behlendorf
8b7791678f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-01 15:55:44 -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
f88ba9f0c5
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 15:50:15 -08:00
Brian Behlendorf
100eb88b46
Update zpios for trivial workload
2008-11-26 15:48:14 -08:00
Brian Behlendorf
3b9ffbc87c
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 15:34:38 -08:00
Brian Behlendorf
62b749c8c8
Working version of M4 macro config
2008-11-26 15:32:39 -08:00
Brian Behlendorf
59fb34706d
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 14:31:51 -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
00c36e7d4d
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 14:09:16 -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
fe0b727e3f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 13:30:45 -08:00
Brian Behlendorf
dbceaca71d
Prefix META_ALIAS with ZFS_
2008-11-26 13:28:44 -08:00
Brian Behlendorf
ea1b9dc3f3
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 13:13:53 -08:00
Brian Behlendorf
cb9c044bf6
Add SPL prefix to META_* #defines
2008-11-26 13:11:33 -08:00
Brian Behlendorf
3db5d3cd8a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 12:55:54 -08:00
Brian Behlendorf
c9a9137956
First step of META build system cleanup
2008-11-26 12:53:24 -08:00
Brian Behlendorf
572b26ddc3
Resolve 'suggest parentheses' warning which was introduced
2008-11-24 14:45:56 -08:00