Merge branch 'maint' into next

Conflicts:
	misc/tune2fs.c

diff --cc misc/tune2fs.c
index 1ae0ee6,a8dc111..a84e6d6
--- 1/misc/tune2fs.c
--- 2/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@@ -2653,8 -2154,8 +2653,7 @@@ retry_open
                int set_csum = 0;
                dgrp_t i;
  
-               if (EXT2_HAS_RO_COMPAT_FEATURE(fs->super,
-                               EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
 -              if (sb->s_feature_ro_compat &
 -                  EXT4_FEATURE_RO_COMPAT_GDT_CSUM) {
++              if (ext2fs_has_group_desc_csum(fs)) {
                        /*
                         * Changing the UUID requires rewriting all metadata,
                         * which can race with a mounted fs.  Don't allow that.