Merge branch 'xfs-gut-icdinode-4.6' into for-next

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

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

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

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

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

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

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