Commit Graph

179 Commits

Author SHA1 Message Date
Brian Behlendorf 33ee5a1dbe Resolve conflict 2008-12-11 14:06:30 -08:00
Brian Behlendorf 98ce19f04c Update avl, nvpair, spl to unique build dirs 2008-12-11 13:54:57 -08:00
Brian Behlendorf 50d862cf14 Resolve conflict 2008-12-11 11:47:40 -08:00
Brian Behlendorf b26c1b6ab0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-11 11:27:25 -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 8978919d1b Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-10 12:56:13 -08:00
Brian Behlendorf fbb34083f0 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-10 12:46:18 -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 e66e190783 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-09 14:18:03 -08:00
Brian Behlendorf 19f58048cb Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-09 14:16:39 -08:00
Brian Behlendorf 5e97ed8493 Move vmem* to libumem 2008-12-09 14:14:00 -08:00
Brian Behlendorf 7af9bd9d90 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-09 13:43:27 -08:00
Brian Behlendorf cc5274f04e Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-09 13:41:02 -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 ee44b4a024 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-08 16:49:51 -08:00
Brian Behlendorf acaaeda92a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2008-12-08 16:46:51 -08:00
Brian Behlendorf 2f40ac4d9e Minor tweak to update script 2008-12-08 16:38:46 -08:00
Brian Behlendorf c0b45720fc Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2008-12-05 14:23:06 -08:00
Brian Behlendorf 18266508c7 Change libport+libsolcompat references to libspl 2008-12-05 14:20:33 -08:00
Brian Behlendorf 9ed7c9b6ad Refresh linux-zpios 2008-12-05 11:32:34 -08:00
Brian Behlendorf 9baaa468ac Refresh zfs-branch 2008-12-05 09:46:11 -08:00
Brian Behlendorf 96072c88e2 Add userspace zfs_context file 2008-12-03 15:43:56 -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 7ebbc0c799 Finish removing all non-upstream bits from master 2008-12-01 16:15:29 -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 100eb88b46 Update zpios for trivial workload 2008-11-26 15:48:14 -08:00
Brian Behlendorf 34dc7c2f25 Initial Linux ZFS GIT Repo 2008-11-20 12:01:55 -08:00