projects / platform / kernel / linux-starfive.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5ff2756 1bb5681)
Merge tag '5.13-rc4-smb3' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 May 2021 00:15:47 +0000 (14:15 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 May 2021 00:15:47 +0000 (14:15 -1000)
commit7c0ec89d31e55d682cd8bf95ca69acc47124fad6
tree48e09141263fae395008a2f7bdcd73f1b30851eftree | snapshot
parent5ff2756afde08b266fbb673849899fec694f39f1commit | diff
parent1bb56810677f26b78d57a3038054943efd334a1ccommit | diff
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
Domain: System / Kernel;