Merge branch 'maint' into next

diff --cc configure.ac
Simple merge

diff --cc debugfs/Makefile.in
Simple merge

diff --cc debugfs/htree.c
Simple merge

diff --cc debugfs/set_fields.c
Simple merge

diff --cc e2fsck/message.c
Simple merge

diff --cc e2fsck/pass1.c
Simple merge

diff --cc e2fsck/pass2.c
Simple merge

diff --cc e2fsck/pass5.c
Simple merge

diff --cc e2fsck/problem.c
Simple merge

diff --cc e2fsck/problem.h
Simple merge

diff --cc ext2ed/doc/ext2ed-design.sgml
Simple merge

diff --cc ext2ed/doc/ext2fs-overview.sgml
Simple merge

diff --cc ext2ed/ext2.descriptors
Simple merge

diff --cc lib/ext2fs/Makefile.in
Simple merge

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

diff --cc lib/ext2fs/ext2_fs.h
Simple merge

diff --cc lib/ext2fs/ext2fs.h
Simple merge

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

diff --cc misc/Makefile.in
Simple merge

diff --cc misc/create_inode.c
Simple merge

diff --cc resize/resize2fs.c
Simple merge