Merge branch 'for-chris-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmana...

author Chris Mason <clm@fb.com>

Thu, 27 Apr 2017 21:13:09 +0000 (14:13 -0700)

committer Chris Mason <clm@fb.com>

Thu, 27 Apr 2017 21:13:09 +0000 (14:13 -0700)
author Chris Mason <clm@fb.com>
Thu, 27 Apr 2017 21:13:09 +0000 (14:13 -0700)
committer Chris Mason <clm@fb.com>
Thu, 27 Apr 2017 21:13:09 +0000 (14:13 -0700)
diff --cc fs/btrfs/extent_io.h
Simple merge
diff --cc fs/btrfs/file.c
Simple merge
diff --cc fs/btrfs/inode.c
Simple merge
author	Chris Mason <clm@fb.com>
	Thu, 27 Apr 2017 21:13:09 +0000 (14:13 -0700)
committer	Chris Mason <clm@fb.com>
	Thu, 27 Apr 2017 21:13:09 +0000 (14:13 -0700)
		1	2
fs/btrfs/extent_io.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history