Merge branch 'maint' into next

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

Tue, 14 Aug 2018 02:40:15 +0000 (22:40 -0400)

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

Tue, 14 Aug 2018 02:40:15 +0000 (22:40 -0400)
author Theodore Ts'o <tytso@mit.edu>
Tue, 14 Aug 2018 02:40:15 +0000 (22:40 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Tue, 14 Aug 2018 02:40:15 +0000 (22:40 -0400)
diff --cc MCONFIG.in
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc misc/tune2fs.c
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Tue, 14 Aug 2018 02:40:15 +0000 (22:40 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Tue, 14 Aug 2018 02:40:15 +0000 (22:40 -0400)
		1	2
MCONFIG.in	patch \|	diff1 \|	diff2 \|	blob \| history
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
misc/tune2fs.c	patch \|	diff1 \|	diff2 \|	blob \| history