Merge branch 'mb/dio' into master

author Theodore Ts'o <tytso@mit.edu>

Tue, 5 Nov 2019 21:21:09 +0000 (16:21 -0500)

committer Theodore Ts'o <tytso@mit.edu>

Tue, 5 Nov 2019 21:21:09 +0000 (16:21 -0500)
author Theodore Ts'o <tytso@mit.edu>
Tue, 5 Nov 2019 21:21:09 +0000 (16:21 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Tue, 5 Nov 2019 21:21:09 +0000 (16:21 -0500)
diff --cc fs/ext4/ext4.h
Simple merge
diff --cc fs/ext4/extents.c
Simple merge
diff --cc fs/ext4/inode.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Tue, 5 Nov 2019 21:21:09 +0000 (16:21 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 5 Nov 2019 21:21:09 +0000 (16:21 -0500)
		1	2
fs/ext4/ext4.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/extents.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history