Merge branch 'maint' into next

Conflicts:
	lib/e2p/ls.c

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

diff --cc debugfs/set_fields.c
Simple merge

diff --cc lib/e2p/ls.c
index ca613150b8025617c64bfb8f075cfa99b8d43048,6785ced04942e212dacef5ba5e8bc176de8bc4fc..5e560edd5815f0a2aa995cf7eb66c76aa7255cd5
--- 1/lib/e2p/ls.c
--- 2/lib/e2p/ls.c
+++ b/lib/e2p/ls.c
@@@ -243,9 -223,12 +243,12 @@@ void list_super2(struct ext2_super_bloc
        fprintf(f, "Filesystem OS type:       %s\n", str);
        free(str);
        fprintf(f, "Inode count:              %u\n", sb->s_inodes_count);
 -      fprintf(f, "Block count:              %u\n", sb->s_blocks_count);
 -      fprintf(f, "Reserved block count:     %u\n", sb->s_r_blocks_count);
 +      fprintf(f, "Block count:              %llu\n", e2p_blocks_count(sb));
 +      fprintf(f, "Reserved block count:     %llu\n", e2p_r_blocks_count(sb));
+       if (sb->s_overhead_blocks)
+               fprintf(f, "Overhead blocks:          %u\n",
+                       sb->s_overhead_blocks);
 -      fprintf(f, "Free blocks:              %u\n", sb->s_free_blocks_count);
 +      fprintf(f, "Free blocks:              %llu\n", e2p_free_blocks_count(sb));
        fprintf(f, "Free inodes:              %u\n", sb->s_free_inodes_count);
        fprintf(f, "First block:              %u\n", sb->s_first_data_block);
        fprintf(f, "Block size:               %u\n", EXT2_BLOCK_SIZE(sb));

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

diff --cc misc/mke2fs.conf.5.in
Simple merge