Merge branch 'maint'

diff --cc e2fsck/journal.c
Simple merge

diff --cc misc/mke2fs.c
index 0980045e42afaa1670fa0a3ba9c066087a33fbd9,9a7e287672b6c57507af3538edd8b84af22f5e8f..01ad9bfa01c9f046b2bd062a1f70b55f237caafd
--- 1/misc/mke2fs.c
--- 2/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -1632,12 -1701,9 +1652,11 @@@ static void PRS(int argc, char *argv[]
                if ((blocksize < 0) && (use_bsize < (-blocksize)))
                        use_bsize = -blocksize;
                blocksize = use_bsize;
 -              fs_param.s_blocks_count /= blocksize / 1024;
 +              ext2fs_blocks_count_set(&fs_param,
 +                                      ext2fs_blocks_count(&fs_param) /
 +                                      (blocksize / 1024));
        } else {
-               if (blocksize < lsector_size ||                 /* Impossible */
-                   (!force && (blocksize < psector_size))) {   /* Suboptimal */
+               if (blocksize < lsector_size) {                 /* Impossible */
                        com_err(program_name, EINVAL,
                                _("while setting blocksize; too small "
                                  "for device\n"));

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