Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Merge branch 'fix-branch' into refs/top-bases/zfs-branch

Remove fix-get-configs dependency from fix-branch

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Merge branch 'fix-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/fix-branch' into fix-branch

Merge branch 'fix-get-configs' into refs/top-bases/fix-branch

Revert fix-get-configs should no longer be needed

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Merge branch 'fix-branch' into refs/top-bases/zfs-branch

Remove fix-dsl_pool_t dependency from fix-branch

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Merge branch 'fix-branch' into refs/top-bases/zfs-branch

Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-branch' into fix-branch

Revert fix-dsl_pool_t fixed upstream

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Merge branch 'fix-branch' into refs/top-bases/zfs-branch

Merge branch 'fix-taskq' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-branch' into fix-branch

Revert fix-taskq changes reevaluate after update.

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Merge branch 'fix-branch' into refs/top-bases/zfs-branch

Remove fix-clock-wrap dependency from fix-branch

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Merge branch 'fix-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/fix-branch' into fix-branch

Merge branch 'fix-clock-wrap' into refs/top-bases/fix-branch

Revert fix-clock-wrap fixed upstream

This was more or less fixed upstream.  Instead of directly accessing
lbolt they now use ddi_get_lbolt() which we can have do the right
thing is the SPL so we don't need to carry this patch.

Re-remove feature-branch dependency.

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Merge branch 'feature-branch' into refs/top-bases/zfs-branch

Conflicts:
cmd/ztest/ztest.c

Revert all remaining changes.

Readd feature-branch to get the last of the reversions

Remove feature-branch.

All but the pthreads changes have been committed upstream and in
the name of keeping the topgit tree as simple as possible I'm removing
the entire 'feature' subtree.  The pthreads changes are now a 'fix'.

Merge branch 'feature-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

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

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

Revert feature-zap-cursor-to-key feature upstream

We can drop this feature and we will pick up the lastest version
during the b141 update.

Merge branch 'feature-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Remove feature-pthreads topic branch

Merge branch 'feature-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

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

Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

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

Revert feature-commit-cb feature upstream

We can drop this feature and we will pick up the lastest version
during the b141 update.

Merge branch 'feature-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

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

Conflicts:
cmd/ztest/ztest.c
lib/libzpool/include/sys/zfs_context.h
lib/libzpool/kernel.c
lib/libzpool/taskq.c

Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

Remove feature-pthreads prior to b141 update.

The pthreads change will need to be reworked and reapplied.
This will be easier to do from scratch rather than sort out
the merge.

Use more correct /usr/bin/awk patch for default.

Ensure COPYRIGHT file is included in the package.

Remove TODO file for spec file.

Prep for 0.4.9 tag update META, README, ChangeLog.

Updated README to reflect the current state of the project and to
be less developer focused.  It now simply includes basic build
instructions for packages and little example of some of the cool
things you can do.

Also remove the out of data TODO file.  This sort of thing can
and be tracked on the GitHub issue tracker.

Minor spec file cleanup for RHEL6 package dependency.

Fix error message to reference the new libuuid package.

It used to be the case that libuuid was part of e2fsprogs.  However,
since other projects unrelated to e2fsprogs make use of that library
it was getting aukward to have that dependency.  The package was
split from e2fsprogs and moved to its own devel package in the
util-linux-ng project.  Anyway, I'm just updating the error message
to reflect the new upstream reality.

Remove explicit import from zconfig test 1.

Due to now resolved bug in the SPL you would need to explicitly
import you zpools after module load.  Now that is no longer the case.
If a cache file is found your pool will be automatically loaded and
available so I'm removing the explicit imports from the test case.

Move build system and core script changes to correct zfs-branch.

Merge commit 'refs/top-bases/zfs-branch' into zfs-branch

Merge branch 'feature-branch' into refs/top-bases/zfs-branch

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

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

Merge branch 'feature-pthreads' into refs/top-bases/feature-branch

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

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 'fix-branch' into refs/top-bases/zfs-branch

Merge commit 'refs/top-bases/fix-branch' into fix-branch

Merge branch 'fix-error-handling' into refs/top-bases/fix-branch

Merge branch 'fix-acl' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-error-handling' into fix-error-handling

Merge commit 'refs/top-bases/fix-acl' into fix-acl

Merge branch 'fix-deadcode' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-deadcode' into fix-deadcode

Merge branch 'fix-strncat' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-strncat' into fix-strncat

Merge branch 'fix-list' into refs/top-bases/fix-branch

Merge branch 'fix-taskq' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-list' into fix-list

Merge commit 'refs/top-bases/fix-taskq' into fix-taskq

Merge branch 'fix-stack' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-stack' into fix-stack

Merge branch 'fix-rwlocks' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-rwlocks' into fix-rwlocks

Merge branch 'fix-no-zmod' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-no-zmod' into fix-no-zmod

Merge branch 'fix-newlines' into refs/top-bases/fix-branch

Merge branch 'fix-get-configs' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-newlines' into fix-newlines

Merge commit 'refs/top-bases/fix-get-configs' into fix-get-configs

Merge branch 'fix-evict-dbufs' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-evict-dbufs' into fix-evict-dbufs

Merge commit 'refs/top-bases/fix-dsl_pool_t' into fix-dsl_pool_t

Merge branch 'fix-dsl_pool_t' into refs/top-bases/fix-branch

Merge branch 'fix-dnode-cons' into refs/top-bases/fix-branch

Merge commit 'refs/top-bases/fix-dnode-cons' into fix-dnode-cons