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-Tag: baikal/aarch64/sdk6.1~4665 X-Git-Url: https://git.baikalelectronics.ru/?a=commitdiff_plain;h=03194139955588452838bebab0962347a22baae4;p=kernel.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 --- 03194139955588452838bebab0962347a22baae4