Merge branch 'xfs-stack-fixes' into for-next