Merge branch 'maint' into next

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

Thu, 4 Oct 2018 14:39:50 +0000 (10:39 -0400)

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

Thu, 4 Oct 2018 14:39:50 +0000 (10:39 -0400)
author Theodore Ts'o <tytso@mit.edu>
Thu, 4 Oct 2018 14:39:50 +0000 (10:39 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Thu, 4 Oct 2018 14:39:50 +0000 (10:39 -0400)
diff --cc Makefile.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>
	Thu, 4 Oct 2018 14:39:50 +0000 (10:39 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 4 Oct 2018 14:39:50 +0000 (10:39 -0400)
		1	2
Makefile.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