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

diff --cc cmd/zpool/zpool_main.c
Simple merge

diff --cc lib/libzfs/libzfs_sendrecv.c
Simple merge

diff --cc module/zfs/arc.c
Simple merge

diff --cc module/zfs/dbuf.c
Simple merge

diff --cc module/zfs/dmu_objset.c
Simple merge

diff --cc module/zfs/dmu_send.c
Simple merge

diff --cc module/zfs/dmu_zfetch.c
Simple merge

diff --cc module/zfs/dsl_dataset.c
Simple merge

diff --cc module/zfs/vdev.c
Simple merge

diff --cc module/zfs/zap_micro.c
Simple merge

diff --cc module/zfs/zfs_znode.c
Simple merge