Merge branch 'xfs-4.10-misc-fixes-4' into for-next

diff --cc fs/xfs/libxfs/xfs_alloc_btree.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_bmap_btree.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_ialloc_btree.c
Simple merge

diff --cc fs/xfs/xfs_buf.c
Simple merge

diff --cc fs/xfs/xfs_file.c
Simple merge

diff --cc fs/xfs/xfs_log.c
Simple merge