]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag '5.17-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Feb 2022 17:16:45 +0000 (09:16 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Feb 2022 17:16:45 +0000 (09:16 -0800)
Pull cifs fixes from Steve French:
 "Three small smb3 reconnect fixes and an error log clarification"

* tag '5.17-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: mark sessions for reconnection in helper function
  cifs: call helper functions for marking channels for reconnect
  cifs: call cifs_reconnect when a connection is marked
  [smb3] improve error message when mount options conflict with posix


Trivial merge