xfs: merge xfs_inum.h into xfs_format.h

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

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

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

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

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

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

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

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

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

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

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

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

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

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