d1f6052365
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2008-12-08 16:25:33 -08:00
de1f5737eb
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2008-12-08 16:25:32 -08:00
e4b31def58
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-08 16:25:32 -08:00
d114b094ad
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-08 16:25:30 -08:00
c3cd0a9715
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-08 16:25:29 -08:00
2b67f51fb6
Attempt move of kernel.c with topgit
2008-12-08 16:20:25 -08:00
1af743d8da
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2008-12-03 15:44:12 -08:00
31e7ba5593
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-03 15:44:11 -08:00
65b9b505cf
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2008-12-03 15:44:11 -08:00
4d579da99f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-03 15:44:10 -08:00
0cf4e1006a
Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch
2008-12-03 15:44:10 -08:00
96072c88e2
Add userspace zfs_context file
2008-12-03 15:43:56 -08:00
2614a847b3
Merge commit 'refs/top-bases/feature-branch' into feature-branch
2008-12-03 12:47:55 -08:00
a0d3a74d7f
Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch
2008-12-03 12:47:54 -08:00
04cd3d24f9
New TopGit dependency: feature-zap-cursor-to-key
2008-12-03 12:47:52 -08:00
e24f5be337
Recreate feature-branch to simply feature merge
2008-12-03 12:47:38 -08:00
97aace11b3
Refresh feature-commit-cb to handle new context
2008-12-03 12:38:46 -08:00
5f10755521
Refreshed feature-zap-cursor-to-key to handle new context
2008-12-03 12:25:47 -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
dd09dedb8b
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-02 08:51:43 -08:00
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
b6097ae55a
Remove stray stub kernel files which should be brought in my linux-kernel-module patch
2008-12-02 08:47:21 -08:00
ff8c81a61f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-01 16:15:58 -08:00
2285428ba2
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-01 16:15:53 -08:00
7ebbc0c799
Finish removing all non-upstream bits from master
2008-12-01 16:15:29 -08:00
8b7791678f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-12-01 15:55:44 -08:00
3179dae49d
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-12-01 15:55:42 -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
f88ba9f0c5
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 15:50:15 -08:00
7753215a0a
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-11-26 15:50:14 -08:00
100eb88b46
Update zpios for trivial workload
2008-11-26 15:48:14 -08:00
3b9ffbc87c
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 15:34:38 -08:00
28c9e4f5fe
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-11-26 15:34:36 -08:00
62b749c8c8
Working version of M4 macro config
2008-11-26 15:32:39 -08:00
59fb34706d
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 14:31:51 -08:00
400ed42523
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-11-26 14:31:49 -08:00
f0e648ca02
Make everything a M4 macro, it's just cleaner that way
2008-11-26 14:29:45 -08:00
00c36e7d4d
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 14:09:16 -08:00
76bf0c16c0
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-11-26 14:09:15 -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
fe0b727e3f
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 13:30:45 -08:00
cb4b777946
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-11-26 13:30:44 -08:00
dbceaca71d
Prefix META_ALIAS with ZFS_
2008-11-26 13:28:44 -08:00
ea1b9dc3f3
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 13:13:53 -08:00
8046a29565
Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key
2008-11-26 13:13:52 -08:00
cb9c044bf6
Add SPL prefix to META_* #defines
2008-11-26 13:11:33 -08:00
3db5d3cd8a
Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb
2008-11-26 12:55:54 -08:00
Brian Behlendorf