Revert all remaining changes.

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.

Remove feature-pthreads topic 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 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.

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

Add AUTHORS to master branch

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

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

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

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

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

Update COPYRIGHT to reference zpios CDDL exceptions.

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-commit-cb' into feature-commit-cb

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

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

Update COPYRIGHT to include release id LLNL-CODE-403049.

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

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

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

Merge branch 'feature-pthreads' 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-zap-cursor-to-key' into refs/top-bases/feature-branch

Update COPYRIGHT and DISCLAIMER.

Update the COPYRIGHT and DISCLAIMER in an attempt to be clear about
the copyright and licensing issues.

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

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

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

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

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

Update nvpair's to include nv_alloc_fixed support

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

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

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

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

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 Solaris FMA style support

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

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

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

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

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

Rename update-zfs.sh -> zfs-update.sh for consistency

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

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

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

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

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

Ignore unsigned module build products

Along with the addition of signed kernel modules in newer kernel
we have a few new build products we need to ignore.   LKLM has the
whole thread for those interested: http://lkml.org/lkml/2007/2/14/164

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

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

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

Use CPU percentages for number of commit cb threads.

This doesn't change number of threads in the kernel, but it reduces number of
threads in ztest (important due to 32-bit address limitations).

Clean up emulation of kernel threads in userspace.

Updated to use pthread thread specific data rather than keeping
a global list.  This also fixes at least one easily reproducible
crash in ztest

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

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

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

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

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

Add .gitignore files to exclude build products

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

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-commit-cb' into feature-commit-cb

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

Pull in latest man pages as part of update-zfs.sh

The script has been updated to download the latest documentations
packages for Solaris and extract the needed ZFS man pages.  These
will still need a little markup to handle changes between the
Solaris and Linux versions of ZFS.  Howver, they should be pretty
minor I've tried hard to keep the interface the same.

In additional to the script update the zdb, zfs, and zpool man
pages have been added to the repo.

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

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

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

Merge branch 'feature-pthreads' 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-zap-cursor-to-key' into refs/top-bases/feature-branch

Remove zvol.c when updating in update-zfs.sh Linux version available.

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-commit-cb' into feature-commit-cb

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