diff --git a/Documentation/filesystems/ext4.txt b/Documentation/filesystems/ext4.txt
index 9544e2c..b33434f 100644
--- a/Documentation/filesystems/ext4.txt
+++ b/Documentation/filesystems/ext4.txt
@@ -223,7 +223,6 @@ noacl			This option disables POSIX Access Control List
 			page and http://acl.bestbits.at/ for more information
 			about acl.
 
-bsddf		(*)	Make 'df' act like BSD.
 minixdf			Make 'df' act like Minix.
 
 debug			Extra debugging information is sent to syslog.
@@ -247,9 +246,6 @@ data_err=abort		Abort the journal if an error occurs in a file
 grpid			Give objects the same group ID as their creator.
 bsdgroups
 
-nogrpid		(*)	New objects have the group ID of their creator.
-sysvgroups
-
 resgid=n		The group ID which may use the reserved blocks.
 
 resuid=n		The user ID which may use the reserved blocks.
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 9ea71aa..a75320e 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -1274,7 +1274,7 @@ static const struct export_operations ext4_export_ops = {
 };
 
 enum {
-	Opt_bsd_df, Opt_minix_df, Opt_grpid, Opt_nogrpid,
+	Opt_minix_df, Opt_grpid,
 	Opt_resgid, Opt_resuid, Opt_sb, Opt_err_cont, Opt_err_panic, Opt_err_ro,
 	Opt_nouid32, Opt_debug, Opt_oldalloc, Opt_orlov,
 	Opt_user_xattr, Opt_nouser_xattr, Opt_acl, Opt_noacl,
@@ -1297,12 +1297,9 @@ enum {
 };
 
 static const match_table_t tokens = {
-	{Opt_bsd_df, "bsddf"},
 	{Opt_minix_df, "minixdf"},
 	{Opt_grpid, "grpid"},
 	{Opt_grpid, "bsdgroups"},
-	{Opt_nogrpid, "nogrpid"},
-	{Opt_nogrpid, "sysvgroups"},
 	{Opt_resgid, "resgid=%u"},
 	{Opt_resuid, "resuid=%u"},
 	{Opt_sb, "sb=%u"},
@@ -1486,24 +1483,13 @@ static int parse_options(char *options, struct super_block *sb,
 		args[0].to = args[0].from = NULL;
 		token = match_token(p, tokens, args);
 		switch (token) {
-		case Opt_bsd_df:
-			ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38");
-			clear_opt(sb, MINIX_DF);
-			break;
 		case Opt_minix_df:
-			ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38");
+			ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "3.5");
 			set_opt(sb, MINIX_DF);
-
 			break;
 		case Opt_grpid:
-			ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38");
+			ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "3.5");
 			set_opt(sb, GRPID);
-
-			break;
-		case Opt_nogrpid:
-			ext4_msg(sb, KERN_WARNING, deprecated_msg, p, "2.6.38");
-			clear_opt(sb, GRPID);
-
 			break;
 		case Opt_resuid:
 			if (match_int(&args[0], &option))