Merge branch 'xfs-misc-fixes-for-4.2-3' into for-next

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

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

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

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

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

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