commit 1a1c849fcaddf0671539b6dc360d42185c64ac43
author Theodore Ts'o <tytso@mit.edu> Tue Jan 31 19:57:49 2017 -0500
committer Theodore Ts'o <tytso@mit.edu> Tue Jan 31 19:57:49 2017 -0500
tree caef7d44094a39522b73bbf764b2e420a81b95be
parent cb2a64a28a162499048834e4f792676e49377b6b
parent 79f7254a14a237c0bf54b4f8658556af38b5c781

Merge branch 'master' into debian

misc/mke2fs.conf.in

diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in
index 812f7c7..a049d61 100644
--- a/misc/mke2fs.conf.in
+++ b/misc/mke2fs.conf.in
@@ -11,11 +11,11 @@
 		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,uninit_bg,inline_data,64bit,dir_nlink,extra_isize
+		features = has_journal,extent,huge_file,flex_bg,metadata_csum,inline_data,64bit,dir_nlink,extra_isize
 		inode_size = 256
 		options = test_fs=1
 	}