Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Add GIT to master

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Rebase master to b105

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Add unicode library

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Remove zdump, it's an unrelateds command which I added simply due to the z* command convention

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Revert changes from this branch so the branch may be removed.  We
will integrate the latest patch from Sun here once everything is
is basically working.  This verion of the patch is out of date
anyone and may not be what is needed.

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Add dropping written variable declaration

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Remove zcommon reference merged in to zpool

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Moving lib/libspl to linux-libspl branch

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Script updates

Move library files to lib

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Fix libspl move to the wrong place

Fix typo

Add a few missing files

Move the world out of /zfs/ and seperate out module build tree

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

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

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Move vmem* to libumem

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Temporarily move taskq+util to libzpool until that directory is broken in to lib+module

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Minor tweak to update script

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Attempt move of kernel.c with topgit

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge branch 'feature-commit-cb' into refs/top-bases/feature-branch

Add userspace zfs_context file

Merge branch 'feature-zap-cursor-to-key' into refs/top-bases/feature-branch

Refresh feature-commit-cb to handle new context

Refreshed feature-zap-cursor-to-key to handle new context

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

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Remove stray stub kernel files which should be brought in my linux-kernel-module patch

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Finish removing all non-upstream bits from master

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Removed build system from master branch, will relocate to linux-zfs-branch

Removed build system from master branch, will relocate to linux-zfs-branch

Relocate COPYING+COPYRIGHT, remove README cruft

Add CDDL license file

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Update zpios for trivial workload

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Working version of M4 macro config

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

Make everything a M4 macro, it's just cleaner that way

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key

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.

Merge commit 'refs/top-bases/feature-commit-cb' into feature-commit-cb

Merge commit 'refs/top-bases/feature-zap-cursor-to-key' into feature-zap-cursor-to-key