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

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

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

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

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