Merge branch 'maint' into next

diff --cc configure
Simple merge

diff --cc configure.in
Simple merge

diff --cc e2fsck/unix.c
Simple merge

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

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

diff --cc misc/dumpe2fs.c
Simple merge

diff --cc resize/resize2fs.c
Simple merge