From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 29 May 2021 00:15:47 +0000 (-1000)
Subject: Merge tag '5.13-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6
X-Git-Tag: v5.15~1053
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c0ec89d31e55d682cd8bf95ca69acc47124fad6;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag '5.13-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6

Pull cifs fixes from Steve French:
 "Three SMB3 fixes.

  Two for stable, and the other fixes a problem pointed out with a
  recently added ioctl"

* tag '5.13-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: change format of CIFS_FULL_KEY_DUMP ioctl
  cifs: fix string declarations and assignments in tracepoints
  cifs: set server->cipher_type to AES-128-CCM for SMB3.0
---

7c0ec89d31e55d682cd8bf95ca69acc47124fad6