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

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

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

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

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

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

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