Merge branch 'maint' into next

diff --cc debugfs/logdump.c
Simple merge

diff --cc e2fsck/pass1.c
Simple merge

diff --cc e2fsck/rehash.c
Simple merge

diff --cc e2fsck/unix.c
Simple merge

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

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

diff --cc misc/mke2fs.c
Simple merge