Merge branch 'xfs-misc-fixes-for-4.2-2' into for-next