Merge branch 'maint' into next

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

Mon, 26 Nov 2018 17:37:41 +0000 (12:37 -0500)

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

Mon, 26 Nov 2018 17:37:41 +0000 (12:37 -0500)
author Theodore Ts'o <tytso@mit.edu>
Mon, 26 Nov 2018 17:37:41 +0000 (12:37 -0500)
committer Theodore Ts'o <tytso@mit.edu>
Mon, 26 Nov 2018 17:37:41 +0000 (12:37 -0500)
diff --cc misc/e2freefrag.c
Simple merge
diff --cc misc/tune2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Mon, 26 Nov 2018 17:37:41 +0000 (12:37 -0500)
committer	Theodore Ts'o <tytso@mit.edu>
	Mon, 26 Nov 2018 17:37:41 +0000 (12:37 -0500)
		1	2
misc/e2freefrag.c	patch \|	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history