Brian Behlendorf
7d4fe54632
txg_init/txg_fini cv_* initialized pulled in upstream in a slightly different way, drop these now redundant versions
2009-01-15 16:22:23 -08:00
Brian Behlendorf
089836c3e4
Resolve conflict with removed cleaner type
2009-01-15 14:14:57 -08:00
Brian Behlendorf
fb5f0bc833
Rebase master to b105
2009-01-15 13:59:39 -08:00
Brian Behlendorf
65520ad8fd
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2009-01-05 12:08:36 -08:00
Brian Behlendorf
42bcb36c89
Add unicode library
2009-01-05 12:03:23 -08:00
Brian Behlendorf
806cd64bf7
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2009-01-05 11:11:43 -08:00
Brian Behlendorf
36b849fa51
Remove zdump, it's an unrelateds command which I added simply due to the z* command convention
2009-01-05 11:10:13 -08:00
Brian Behlendorf
c858ba1738
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-12 13:46:44 -08:00
Brian Behlendorf
810db7e0a2
Remove zcommon reference merged in to zpool
2008-12-12 13:41:20 -08:00
Brian Behlendorf
0e2a3e83d9
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 15:40:33 -08:00
Brian Behlendorf
6b2c60acca
Moving lib/libspl to linux-libspl branch
2008-12-11 15:38:59 -08:00
Brian Behlendorf
b53201c0ca
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 14:25:16 -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
f421307e1b
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-11 11:26:25 -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
aa79842875
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-10 12:45:40 -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
ed67495146
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-09 14:16:24 -08:00
Brian Behlendorf
5e97ed8493
Move vmem* to libumem
2008-12-09 14:14:00 -08:00
Brian Behlendorf
a2763bcded
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-09 13:40:27 -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
b7554a89d2
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-08 16:46:20 -08:00
Brian Behlendorf
2f40ac4d9e
Minor tweak to update script
2008-12-08 16:38:46 -08:00
Brian Behlendorf
f59db25d22
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-08 16:25:05 -08:00
Brian Behlendorf
2b67f51fb6
Attempt move of kernel.c with topgit
2008-12-08 16:20:25 -08:00
Brian Behlendorf
a01917a91d
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-03 16:56:00 -08:00
Brian Behlendorf
96072c88e2
Add userspace zfs_context file
2008-12-03 15:43:56 -08:00
Brian Behlendorf
b981a3ab4b
spa->spa_zio_cv dropped in upstream source, update fix-locks patch accordingly
2008-12-03 12:54:50 -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
a5c8544c51
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-02 08:51:57 -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
0d8d373bc4
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-12-01 16:16:14 -08:00
Brian Behlendorf
7ebbc0c799
Finish removing all non-upstream bits from master
2008-12-01 16:15:29 -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
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
55c689cc3c
Merge commit 'refs/top-bases/fix-locks' into fix-locks
2008-11-26 15:50:26 -08:00
Brian Behlendorf
100eb88b46
Update zpios for trivial workload
2008-11-26 15:48:14 -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
62b749c8c8
Working version of M4 macro config
2008-11-26 15:32:39 -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
f0e648ca02
Make everything a M4 macro, it's just cleaner that way
2008-11-26 14:29:45 -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
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