Merge branch 'maint' into next

diff --cc e2fsck/unix.c
Simple merge

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

diff --cc misc/Makefile.in
Simple merge

diff --cc misc/e2fuzz.c
Simple merge

diff --cc misc/mke2fs.8.in
Simple merge

diff --cc misc/mke2fs.c
Simple merge

diff --cc misc/tune2fs.c
Simple merge