Merge branch 'maint' into next

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

diff --cc e2fsck/e2fsck.h
Simple merge

diff --cc e2fsck/journal.c
Simple merge

diff --cc e2fsck/pass1.c
Simple merge

diff --cc e2fsck/pass2.c
Simple merge

diff --cc e2fsck/rehash.c
Simple merge

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

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

diff --cc misc/mke2fs.c
Simple merge

diff --cc misc/tune2fs.c
Simple merge