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

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

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

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

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

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

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

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