From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 21 Feb 2011 02:54:43 +0000 (-0500)
Subject: Merge branch 'maint' into next
X-Git-Tag: v1.42-WIP-0702~50
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=214580a339a18b0539b5998d3b47934956a30a1c;p=thirdparty%2Fe2fsprogs.git

Merge branch 'maint' into next

Conflicts:
	misc/mke2fs.conf.5.in
---

214580a339a18b0539b5998d3b47934956a30a1c
diff --cc misc/mke2fs.conf.5.in
index e9913cba7,cb44c7f85..2e8b58508
--- a/misc/mke2fs.conf.5.in
+++ b/misc/mke2fs.conf.5.in
@@@ -303,14 -314,13 +314,21 @@@ relations.  It may be overridden by th
  command-line option to
  .BR mke2fs (8).
  .TP
 +.I auto_64-bit_support
 +This relation is a boolean which specifies whether
 +.BR mke2fs (8)
 +should automatically add the 64bit feature if the number of blocks for
 +the file system requires this feature to be enabled.  The resize_inode
 +feature is also automatically disabled since it doesn't support 64-bit
 +block numbers.
 +.TP
+ .I default_mntopts
+ This relation specifies the set of mount options which should be enabled
+ by default.  These may be changed at a later time with the
+ .B -o
+ command-line option to
+ .BR tune2fs (8).
+ .TP
  .I blocksize
  This relation specifies the default blocksize if the user does not
  specify a blocksize on the command line.