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

diff --cc fs/xfs/libxfs/xfs_attr_leaf.h
Simple merge

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

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

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

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

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

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

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