Merge branch 'xfs-4.7-error-cfg' into for-next