Merge branch 'maint' into next

diff --cc e2fsck/super.c
Simple merge

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

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

diff --cc misc/e2image.c
Simple merge

diff --cc misc/tune2fs.c
Simple merge

diff --cc resize/resize2fs.c
Simple merge