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

diff --cc cmd/zfs/zfs_main.c
Simple merge

diff --cc lib/libuutil/uu_misc.c
Simple merge

diff --cc module/zcommon/zprop_common.c
Simple merge

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

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

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