From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Jul 2017 21:04:48 +0000 (-0700)
Subject: Merge tag 'smb3-security-fixes-for-4.13' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v4.14-rc1~496
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=908b852df1d5d27d289e915fea7bfc16d38b8a76;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'smb3-security-fixes-for-4.13' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes and sane default from Steve French:
 "Upgrade default dialect to more secure SMB3 from older cifs dialect"

* tag 'smb3-security-fixes-for-4.13' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: Clean up unused variables in smb2pdu.c
  [SMB3] Improve security, move default dialect to SMB3 from old CIFS
  [SMB3] Remove ifdef since SMB3 (and later) now STRONGLY preferred
  CIFS: Reconnect expired SMB sessions
  CIFS: Display SMB2 error codes in the hex format
  cifs: Use smb 2 - 3 and cifsacl mount options setacl function
  cifs: prototype declaration and definition to set acl for smb 2 - 3 and cifsacl mount options
---

908b852df1d5d27d289e915fea7bfc16d38b8a76