aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-10 14:53:11 +1200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-10 14:53:11 +1200
commit65112dccf8a113737684366349d7f9ec373ddc47 (patch)
tree4aaaffb4cfd48954ba8e0c174a2a963ad012295a
parentbbf5e9743fd6c9b4ef8a34db8a9502baf4191524 (diff)
parent9d1e397b7bafe843564eab26ed3f682637159c6c (diff)
downloadlinux-linaro-stable-65112dccf8a113737684366349d7f9ec373ddc47.tar.gz
Merge git://git.samba.org/sfrench/cifs-2.6
* git://git.samba.org/sfrench/cifs-2.6: [CIFS] Fix first time message on mount, ntlmv2 upgrade delayed to 3.2
-rw-r--r--fs/cifs/connect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index f4af4cc37500..71beb0201970 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -2018,7 +2018,7 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info)
warned_on_ntlm = true;
cERROR(1, "default security mechanism requested. The default "
"security mechanism will be upgraded from ntlm to "
- "ntlmv2 in kernel release 3.1");
+ "ntlmv2 in kernel release 3.2");
}
ses->overrideSecFlg = volume_info->secFlg;