Merge branch 'maint' into next

diff --cc e2fsck/pass1.c
Simple merge

diff --cc e2fsck/pass2.c
index 306373b,06f0954..d3f2101
--- 1/e2fsck/pass2.c
--- 2/e2fsck/pass2.c
+++ b/e2fsck/pass2.c
@@@ -993,9 -931,10 +993,10 @@@ static int check_dir_block(ext2_filsys 
        int     is_leaf = 1;
        size_t  inline_data_size = 0;
        int     filetype = 0;
 -      int     encrypted = 0;
 +      __u32   dir_encpolicy_id = NO_ENCRYPTION_POLICY;
        size_t  max_block_size;
        int     hash_flags = 0;
+       static char *eop_read_dirblock = NULL;
  
        cd = (struct check_dir_struct *) priv_data;
        ibuf = buf = cd->buf;

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

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

diff --cc misc/fuse2fs.c
Simple merge

diff --cc misc/mke2fs.c
Simple merge