Merge branch 'xfs-torn-log-fixes-4.5' into for-next