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.

Remove gcc-shadow from gcc-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 commit 'refs/top-bases/gcc-branch' into gcc-branch

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Add AUTHORS to master branch

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Update COPYRIGHT to reference zpios CDDL exceptions.

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

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

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

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

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

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

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

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