Merge branch 'xfs-consolidate-format-defs' into for-next

diff --cc fs/xfs/xfs_bmap_util.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
Simple merge

diff --cc fs/xfs/xfs_itable.c
Simple merge

diff --cc fs/xfs/xfs_log.c
Simple merge

diff --cc fs/xfs/xfs_mount.c
Simple merge

diff --cc fs/xfs/xfs_mount.h
Simple merge

diff --cc fs/xfs/xfs_qm_syscalls.c
Simple merge

diff --cc fs/xfs/xfs_super.c
Simple merge