Commit Graph

74 Commits

Author SHA1 Message Date
Brian Behlendorf 87307ab12a Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-02-18 14:30:48 -08:00
Brian Behlendorf d164b20935 Rebase master to b108 2009-02-18 12:51:31 -08:00
Brian Behlendorf 3bac1c60c0 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-01-26 22:01:15 -08:00
Brian Behlendorf c65e71073f Refresh type in topgit git://* reference 2009-01-26 21:58:32 -08:00
Brian Behlendorf 3c39b49269 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-01-20 15:46:26 -08:00
Brian Behlendorf 4710ede86a Add GIT to master 2009-01-20 15:43:44 -08:00
Brian Behlendorf 27cf20b0d6 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-01-15 14:16:19 -08:00
Brian Behlendorf fb5f0bc833 Rebase master to b105 2009-01-15 13:59:39 -08:00
Brian Behlendorf 52bc9eee2b Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-01-05 12:09:00 -08:00
Brian Behlendorf 42bcb36c89 Add unicode library 2009-01-05 12:03:23 -08:00
Brian Behlendorf 80330daf72 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2009-01-05 11:11:54 -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 6f3a9cb131 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-12 13:46:56 -08:00
Brian Behlendorf 810db7e0a2 Remove zcommon reference merged in to zpool 2008-12-12 13:41:20 -08:00
Brian Behlendorf 2308a268a5 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 15:41:51 -08:00
Brian Behlendorf 6b2c60acca Moving lib/libspl to linux-libspl branch 2008-12-11 15:38:59 -08:00
Brian Behlendorf f86c85c6a1 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 14:25:30 -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 e1694cfaec Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-11 11:27:18 -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 f4fe97d169 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-10 12:46:13 -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 da9682b967 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-09 14:16:37 -08:00
Brian Behlendorf 5e97ed8493 Move vmem* to libumem 2008-12-09 14:14:00 -08:00
Brian Behlendorf 9936555889 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-09 13:41:00 -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 a04078c818 Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key 2008-12-08 16:46:46 -08:00
Brian Behlendorf 2f40ac4d9e Minor tweak to update script 2008-12-08 16:38:46 -08:00
Brian Behlendorf 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
Brian Behlendorf 2b67f51fb6 Attempt move of kernel.c with topgit 2008-12-08 16:20:25 -08:00
Brian Behlendorf 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
Brian Behlendorf 96072c88e2 Add userspace zfs_context file 2008-12-03 15:43:56 -08:00
Brian Behlendorf 5f10755521 Refreshed feature-zap-cursor-to-key to handle new context 2008-12-03 12:25:47 -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 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
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 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
Brian Behlendorf 7ebbc0c799 Finish removing all non-upstream bits from master 2008-12-01 16:15:29 -08:00
Brian Behlendorf 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
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 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
Brian Behlendorf 100eb88b46 Update zpios for trivial workload 2008-11-26 15:48:14 -08:00
Brian Behlendorf 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