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