From: Theodore Ts'o <tytso@mit.edu>
Date: Fri, 5 Jan 2018 03:02:53 +0000 (-0500)
Subject: Merge branch 'maint' into debian-branch
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fdebian-branch;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into debian-branch
---

10017cf15e17cebe949a66cd10e4d8497b1bdf48
diff --cc misc/mke2fs.conf.in
index a049d61d5,d0066b78b..01e35cf83
--- a/misc/mke2fs.conf.in
+++ b/misc/mke2fs.conf.in
@@@ -11,14 -11,9 +11,9 @@@
  		features = has_journal
  	}
  	ext4 = {
 -		features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize
 +		features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize
  		inode_size = 256
  	}
- 	ext4dev = {
- 		features = has_journal,extent,huge_file,flex_bg,metadata_csum,inline_data,64bit,dir_nlink,extra_isize
- 		inode_size = 256
- 		options = test_fs=1
- 	}
  	small = {
  		blocksize = 1024
  		inode_size = 128