Merge branch 'xfs-dio-fix-4.6' into for-next