]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag '5.16-rc2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Nov 2021 18:48:14 +0000 (10:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Nov 2021 18:48:14 +0000 (10:48 -0800)
Pull cifs fixes from Steve French:
 "Four small cifs/smb3 fixes:

   - two multichannel fixes

   - fix problem noted by kernel test robot

   - update internal version number"

* tag '5.16-rc2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: update internal version number
  smb2: clarify rc initialization in smb2_reconnect
  cifs: populate server_hostname for extra channels
  cifs: nosharesock should be set on new server


Trivial merge