Merge branch 'xfs-4.7-optimise-inline-symlinks' into for-next

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

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

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

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