Merge branch 'xfs-misc-fixes-for-4.4-2' into for-next

diff --cc fs/xfs/libxfs/xfs_format.h
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_ioctl.c
Simple merge

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

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

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

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