Merge branch 'xfs-misc-fixes-4.6' into for-next