Merge branch 'xfs-4.7-trans-type-cleanup' into for-next