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