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

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

diff --cc lib/libzpool/kernel.c
Simple merge

diff --cc module/zfs/include/sys/spa.h
Simple merge

diff --cc module/zfs/include/sys/zfs_znode.h
Simple merge

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

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