]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f82275d 12e2f9e)
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)
commit7cee74775a723a253c5082affea20db133676528
tree48e09141263fae395008a2f7bdcd73f1b30851eftree | snapshot
parentf82275d993e24448cb9fdddb95fdced06f585e5fcommit | diff
parent12e2f9e09da40932364472f34d3839228738de7fcommit | 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
Linux Kernel Source Tree.