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

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

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

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

diff --cc fs/xfs/xfs_dquot.c
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_log_recover.c
Simple merge

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