Merge git://git.samba.org/sfrench/cifs-2.6

65112dcc · Linus Torvalds <[email protected]> · 2011-10-10 14:53:11 +12:00

* git://git.samba.org/sfrench/cifs-2.6:
  [CIFS] Fix first time message on mount, ntlmv2 upgrade delayed to 3.2

Merge commit. Changes below are compared with the first parent: bbf5e974.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/cifs/connect.c	modified	+1	−1	View file

diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index f4af4cc..71beb02 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;
 