Merge branch 'xfs-misc-fixes-3.17-1' into for-next