Merge branch 'xfs-4.8-buf-fixes' into for-next