Merge branch 'xfs-4.8-iomap-write' into for-next

author Dave Chinner <david@fromorbit.com>

Tue, 21 Jun 2016 00:10:38 +0000 (10:10 +1000)

committer Dave Chinner <david@fromorbit.com>

Tue, 21 Jun 2016 00:10:38 +0000 (10:10 +1000)
author Dave Chinner <david@fromorbit.com>
Tue, 21 Jun 2016 00:10:38 +0000 (10:10 +1000)
committer Dave Chinner <david@fromorbit.com>
Tue, 21 Jun 2016 00:10:38 +0000 (10:10 +1000)
diff --cc fs/xfs/xfs_bmap_util.c
Simple merge
diff --cc fs/xfs/xfs_inode.h
Simple merge
author	Dave Chinner <david@fromorbit.com>
	Tue, 21 Jun 2016 00:10:38 +0000 (10:10 +1000)
committer	Dave Chinner <david@fromorbit.com>
	Tue, 21 Jun 2016 00:10:38 +0000 (10:10 +1000)
		1	2
fs/xfs/xfs_bmap_util.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/xfs/xfs_inode.h	patch \|	diff1 \|	diff2 \|	blob \| history