From 63c11ddff144b89d281becf5c0a539a3e8f8fc45 Mon Sep 17 00:00:00 2001
From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 16 May 2012 07:53:00 -0400
Subject: [PATCH] --- yaml --- r: 308797 b: refs/heads/master c:
 09983b2fab80fa037b1dcf9a11de5a70df59ef7f h: refs/heads/master i:   308795:
 ec46442070b675fae79ad601c20a28ea37ddacf1 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/cifs/connect.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a633e675d33c..bd3b6ea28a4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15b6a47322940beb74a83ffc1632c1ee1d00f35b
+refs/heads/master: 09983b2fab80fa037b1dcf9a11de5a70df59ef7f
diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c
index 4898759d97cc..34186805e639 100644
--- a/trunk/fs/cifs/connect.c
+++ b/trunk/fs/cifs/connect.c
@@ -1457,10 +1457,16 @@ cifs_parse_mount_options(const char *mountdata, const char *devname,
 		case Opt_direct:
 			vol->direct_io = true;
 			vol->strict_io = false;
+			cERROR(1, "The \"directio\" option will be removed in "
+				  "3.7. Please switch to the \"cache=none\" "
+				  "option.");
 			break;
 		case Opt_strictcache:
 			vol->direct_io = false;
 			vol->strict_io = true;
+			cERROR(1, "The \"strictcache\" option will be removed "
+				"in 3.7. Please switch to the \"cache=strict\" "
+				"option.");
 			break;
 		case Opt_noac:
 			printk(KERN_WARNING "CIFS: Mount option noac not "