| commit | 7c0ec89d31e55d682cd8bf95ca69acc47124fad6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 28 14:15:47 2021 -1000 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 28 14:15:47 2021 -1000 |
| tree | 48e09141263fae395008a2f7bdcd73f1b30851ef | |
| parent | 5ff2756afde08b266fbb673849899fec694f39f1 [diff] | |
| parent | 1bb56810677f26b78d57a3038054943efd334a1c [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