From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 29 Feb 2008 05:43:29 +0000 (-0500)
Subject: Merge branch 'maint'
X-Git-Tag: v1.41-WIP-0427~77
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=399033a6ab713bc1f8ebad90e47fced0e7491b62;p=tools%2Fe2fsprogs.git

Merge branch 'maint'
---

399033a6ab713bc1f8ebad90e47fced0e7491b62
diff --cc misc/tune2fs.c
index fae5875,4f66d42..dc44d56
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@@ -126,11 -125,9 +127,10 @@@ static __u32 clear_ok_features[3] = 
  		EXT2_FEATURE_COMPAT_RESIZE_INODE |
  		EXT2_FEATURE_COMPAT_DIR_INDEX,
  	/* Incompat */
 -	EXT2_FEATURE_INCOMPAT_FILETYPE,
 +	EXT2_FEATURE_INCOMPAT_FILETYPE |
 +		EXT4_FEATURE_INCOMPAT_FLEX_BG,
  	/* R/O compat */
- 	EXT2_FEATURE_RO_COMPAT_LARGE_FILE |
- 		EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER
+ 	EXT2_FEATURE_RO_COMPAT_LARGE_FILE
  };
  
  /*