Merge branch 'maint' into next

Conflicts:
	misc/mke2fs.c

diff --cc e2fsck/unix.c
Simple merge

diff --cc e2fsck/util.c
Simple merge

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

diff --cc misc/mke2fs.c
index 3bc4088,32b4c34..8dd656c
--- 1/misc/mke2fs.c
--- 2/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@@ -1991,13 -1921,15 +1991,22 @@@ profile_error
        if (extended_opts)
                parse_extended_opts(&fs_param, extended_opts);
  
 +      /* Don't allow user to set both metadata_csum and uninit_bg bits. */
 +      if ((fs_param.s_feature_ro_compat &
 +           EXT4_FEATURE_RO_COMPAT_METADATA_CSUM) &&
 +          (fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_GDT_CSUM))
 +              fs_param.s_feature_ro_compat &=
 +                              ~EXT4_FEATURE_RO_COMPAT_GDT_CSUM;
 +
+       /* Can't support bigalloc feature without extents feature */
+       if ((fs_param.s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_BIGALLOC) &&
+           !(fs_param.s_feature_incompat & EXT3_FEATURE_INCOMPAT_EXTENTS)) {
+               com_err(program_name, 0,
+                       _("Can't support bigalloc feature without "
+                         "extents feature"));
+               exit(1);
+       }
+ 
        /* Since sparse_super is the default, we would only have a problem
         * here if it was explicitly disabled.
         */