Merge branch 'xfs-filestreams-lookup' into for-next

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

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

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

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

diff --cc fs/xfs/xfs_trace.h
Simple merge