Merge branch 'maint' into next

diff --cc Makefile.in
index a2e1756b802eee9c1fb07353e8c1806f7f082b57,f443fba598c27fa72bc41c120c498b381015f171..7da9ad7df16f709e59a9214b919155934c7407ea
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -34,6 -34,7 +34,7 @@@ subs: $(DEP_SUBSTITUTE
                then $(MAKE) $$i || exit $$? ; fi ; done
        @(if test -d lib/et ; then cd lib/et && $(MAKE) compile_et; fi)
        @(if test -d lib/ext2fs ; then cd lib/ext2fs && $(MAKE) ext2_err.h; fi)
 -      @(if test -d e2fsck ; then cd e2fsck && $(MAKE) prof_err.h; fi)
++      @(if test -d lib/support ; then cd lib/support && $(MAKE) prof_err.h; fi)
  
  progs: all-progs-recursive
  libs: all-libs-recursive

diff --cc debugfs/debugfs.8.in
Simple merge

diff --cc debugfs/debugfs.c
Simple merge

diff --cc lib/blkid/probe.c
Simple merge

diff --cc lib/e2p/fgetversion.c
Simple merge

diff --cc lib/ext2fs/tdb.c
Simple merge

diff --cc misc/findsuper.c
Simple merge

diff --cc misc/lsattr.c
Simple merge

diff --cc misc/util.c
Simple merge

diff --cc tests/Makefile.in
Simple merge

diff --cc util/subst.c
Simple merge