Merge branch 'xfs-misc-fixes-for-3.18-3' into for-next