diff --git a/[refs] b/[refs]
index edd716061a1d..e94918856111 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7198b9c1e4520d3b16f0f65e37d3db78745f1e1
+refs/heads/master: f70486055ee351158bd6999f3965ad378b52c694
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 960681fae64e..25b1f0374f01 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -1443,6 +1443,10 @@ static int handle_mount_opt(struct super_block *sb, char *opt, int token,
 	if (args->from && match_int(args, &arg))
 		return -1;
 	switch (token) {
+	case Opt_noacl:
+	case Opt_nouser_xattr:
+		ext4_msg(sb, KERN_WARNING, deprecated_msg, opt, "3.5");
+		break;
 	case Opt_sb:
 		return 1;	/* handled by get_sb_block() */
 	case Opt_removed: