Merge branch 'maint' into next

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

Thu, 23 Aug 2018 15:33:22 +0000 (11:33 -0400)

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

Thu, 23 Aug 2018 15:33:22 +0000 (11:33 -0400)
author Theodore Ts'o <tytso@mit.edu>
Thu, 23 Aug 2018 15:33:22 +0000 (11:33 -0400)
committer Theodore Ts'o <tytso@mit.edu>
Thu, 23 Aug 2018 15:33:22 +0000 (11:33 -0400)
diff --cc Makefile.in
Simple merge
diff --cc debian/control
Simple merge
diff --cc debian/rules
Simple merge
author	Theodore Ts'o <tytso@mit.edu>
	Thu, 23 Aug 2018 15:33:22 +0000 (11:33 -0400)
committer	Theodore Ts'o <tytso@mit.edu>
	Thu, 23 Aug 2018 15:33:22 +0000 (11:33 -0400)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history
debian/rules	patch \|	diff1 \|	diff2 \|	blob \| history