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

diff --cc cmd/zdb/zdb.c
Simple merge

diff --cc cmd/ztest/ztest.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