Merge branch 'maint' into next

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

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

diff --cc misc/dumpe2fs.c
Simple merge

diff --cc misc/mk_hugefiles.c
Simple merge

diff --cc misc/tune2fs.c
Simple merge