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