From: Theodore Ts'o <tytso@mit.edu>
Date: Tue, 29 Aug 2017 14:04:27 +0000 (-0400)
Subject: Merge tag 'v1.43.6' into debian-packaging
X-Git-Tag: debian-1.43.6-1~1
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2816e2195e39660fee05332d13118164b24e9545;p=tools%2Fe2fsprogs.git

Merge tag 'v1.43.6' into debian-packaging

v1.43.6
---

2816e2195e39660fee05332d13118164b24e9545
diff --cc misc/mke2fs.conf.in
index a049d61,d0066b7..01e35cf
--- 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