Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next