Merge branch 'xfs-collapse-range' into for-next