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

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

diff --cc zfs/lib/libzcommon/zprop_common.c
Simple merge

diff --cc zfs/lib/libzpool/arc.c
Simple merge

diff --cc zfs/lib/libzpool/dbuf.c
Simple merge

diff --cc zfs/lib/libzpool/dsl_dataset.c
Simple merge

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