Merge branch 'maint' into next

Conflicts:
	resize/resize2fs.c

diff --cc misc/mke2fs.c
Simple merge

diff --cc resize/resize2fs.c
index 8a02ff4,861acff..8d6f198
--- 1/resize/resize2fs.c
--- 2/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@@ -481,7 -480,10 +479,9 @@@ retry
        group_block = fs->super->s_first_data_block +
                old_fs->group_desc_count * fs->super->s_blocks_per_group;
  
 -      csum_flag = EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
 -                                             EXT4_FEATURE_RO_COMPAT_GDT_CSUM);
 +      csum_flag = ext2fs_has_group_desc_csum(fs);
+       if (access("/sys/fs/ext4/features/lazy_itable_init", F_OK) == 0)
+               lazy_itable_init = 1;
        adj = old_fs->group_desc_count;
        max_group = fs->group_desc_count - adj;
        if (fs->super->s_feature_incompat & EXT2_FEATURE_INCOMPAT_META_BG)

diff --cc tests/f_mmp/script
Simple merge