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

Conflicts:
cmd/ztest/ztest.c
lib/libzfs/libzfs_sendrecv.c
module/zfs/dmu_objset.c
module/zfs/dnode.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/txg.h
module/zfs/spa_history.c

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

Merge branch 'gcc-fortify-source' into refs/top-bases/gcc-branch

Merge branch 'gcc-missing-braces' into refs/top-bases/gcc-branch

Conflicts:
lib/libzfs/libzfs_pool.c

Merge branch 'gcc-ident-pragmas' into refs/top-bases/gcc-branch

Merge branch 'gcc-64bit-constants' into refs/top-bases/gcc-branch

Merge branch 'gcc-unused' into refs/top-bases/gcc-branch

Conflicts:
module/zfs/dbuf.c
module/zfs/dsl_dataset.c

Merge branch 'gcc-uninit' into refs/top-bases/gcc-branch

Merge branch 'gcc-no-parenthesis' into refs/top-bases/gcc-branch

Merge branch 'gcc-missing-case' into refs/top-bases/gcc-branch

Merge branch 'gcc-invalid-prototype' into refs/top-bases/gcc-branch

Conflicts:
cmd/zdb/zdb_il.c

Merge branch 'gcc-init-pragmas' into refs/top-bases/gcc-branch

Merge branch 'gcc-debug' into refs/top-bases/gcc-branch

Merge branch 'gcc-cast' into refs/top-bases/gcc-branch

Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c

Merge branch 'gcc-c90' into refs/top-bases/gcc-branch

Conflicts:
cmd/zdb/zdb.c
cmd/zdb/zdb_il.c
cmd/zfs/zfs_main.c
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_main.c
cmd/zpool/zpool_util.c
cmd/ztest/ztest.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_changelist.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_import.c
lib/libzfs/libzfs_mount.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/arc.c
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dmu_zfetch.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/dsl_prop.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zfs_znode.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/metaslab.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/vdev.c
module/zfs/zap_micro.c
module/zfs/zfs_ioctl.c
module/zfs/zfs_replay.c
module/zfs/zio.c
module/zfs/zio_compress.c

Merge commit 'refs/top-bases/gcc-unused' into gcc-unused

Conflicts:
module/zfs/dbuf.c
module/zfs/dmu.c
module/zfs/dmu_objset.c
module/zfs/dnode_sync.c
module/zfs/dsl_dataset.c
module/zfs/dsl_prop.c
module/zfs/metaslab.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zap_micro.c

Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit

Conflicts:
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c
module/zfs/arc.c

Merge commit 'refs/top-bases/gcc-no-parenthesis' into gcc-no-parenthesis

Conflicts:
lib/libzfs/libzfs_dataset.c
module/zfs/dmu_objset.c
module/zfs/dsl_dataset.c
module/zfs/dsl_pool.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c
module/zfs/zio.c

Merge commit 'refs/top-bases/gcc-missing-case' into gcc-missing-case

Conflicts:
lib/libzfs/libzfs_changelist.c
module/zfs/spa.c
module/zfs/zfs_ioctl.c

Merge commit 'refs/top-bases/gcc-missing-braces' into gcc-missing-braces

Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_dataset.c
lib/libzfs/libzfs_pool.c
lib/libzfs/libzfs_sendrecv.c

Merge commit 'refs/top-bases/gcc-invalid-prototype' into gcc-invalid-prototype

Conflicts:
cmd/zdb/zdb_il.c
cmd/ztest/ztest.c
lib/libzfs/libzfs_mount.c

Merge commit 'refs/top-bases/gcc-init-pragmas' into gcc-init-pragmas

Conflicts:
lib/libzfs/libzfs_mount.c

Merge commit 'refs/top-bases/gcc-fortify-source' into gcc-fortify-source

Conflicts:
cmd/zdb/zdb.c

Merge commit 'refs/top-bases/gcc-debug' into gcc-debug

Merge commit 'refs/top-bases/gcc-cast' into gcc-cast

Conflicts:
cmd/zfs/zfs_main.c
cmd/zpool/zpool_main.c
cmd/ztest/ztest.c

Merge commit 'refs/top-bases/gcc-64bit-constants' into gcc-64bit-constants

Conflicts:
cmd/ztest/ztest.c
module/zfs/include/sys/zfs_znode.h

Merge commit 'refs/top-bases/gcc-ident-pragmas' into gcc-ident-pragmas

Conflicts:
cmd/zfs/zfs_util.h
cmd/zinject/zinject.h
cmd/zpool/zpool_util.c
lib/libnvpair/include/libnvpair.h
lib/libnvpair/libnvpair.c
lib/libzfs/libzfs_config.c
lib/libzfs/libzfs_import.c
module/avl/avl.c
module/avl/include/sys/avl.h
module/nvpair/include/sys/nvpair.h
module/nvpair/nvpair.c
module/zcommon/include/zfs_comutil.h
module/zcommon/include/zfs_prop.h
module/zcommon/zfs_comutil.c
module/zfs/dmu_zfetch.c
module/zfs/dsl_synctask.c
module/zfs/include/sys/dmu_tx.h
module/zfs/include/sys/dmu_zfetch.h
module/zfs/include/sys/dsl_synctask.h
module/zfs/include/sys/refcount.h
module/zfs/include/sys/txg.h
module/zfs/include/sys/uberblock.h
module/zfs/include/sys/zap_leaf.h
module/zfs/include/sys/zfs_debug.h
module/zfs/include/sys/zio_compress.h
module/zfs/include/sys/zvol.h
module/zfs/lzjb.c
module/zfs/refcount.c
module/zfs/sha256.c
module/zfs/spa_boot.c
module/zfs/uberblock.c
module/zfs/zfs_replay.c
module/zfs/zio_compress.c

Merge commit 'refs/top-bases/gcc-c90' into gcc-c90

Conflicts:
cmd/zdb/zdb.c
cmd/ztest/ztest.c
module/zfs/dbuf.c
module/zfs/dsl_dataset.c
module/zfs/dsl_scrub.c
module/zfs/spa.c
module/zfs/vdev.c
module/zfs/zio.c

Update core ZFS code from build 121 to build 141.

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

Remove gcc-shadow from gcc-branch

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

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

Merge branch 'gcc-shadow' into refs/top-bases/gcc-branch

Conflicts:
lib/libzfs/libzfs_util.c

Revert gcc-shadow using -Wno-shadow I can live with

While I would rather fix all the instances where something is shadowed
it complicates tracking the OpenSolaris code where they either don't
seem to care or have different conflicts.  Anyway, this ends up being
more simply gratutous change than I care for.

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

Remove fix-get-configs dependency from fix-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 branch 'fix-branch' into refs/top-bases/zfs-branch

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

Remove fix-clock-wrap dependency from fix-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.

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

Conflicts:
cmd/ztest/ztest.c

Revert all remaining changes.

Merge branch 'feature-branch' into refs/top-bases/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

Remove feature-pthreads topic branch

Merge branch 'feature-branch' into refs/top-bases/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/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 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