From: Linus Torvalds Date: Sun, 13 Feb 2022 17:16:45 +0000 (-0800) Subject: Merge tag '5.17-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e9c25787db080cb28601ce182088ce77659f684b;p=linux.git Merge tag '5.17-rc4-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6 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 --- e9c25787db080cb28601ce182088ce77659f684b