From: Linus Torvalds Date: Sun, 23 Jun 2024 15:01:57 +0000 (-0400) Subject: Merge tag '6.10-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 X-Git-Tag: dma-mapping-6.11-2024-07-19~77 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d14f2780f0552edac67c24ac8868d44b2b1022a3;p=users%2Fhch%2Fdma-mapping.git Merge tag '6.10-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6 Pull smb client fixes from Steve French: "Five smb3 client fixes - three nets/fiolios cifs fixes - fix typo in module parameters description - fix incorrect swap warning" * tag '6.10-rc4-smb3-client-fixes' of git://git.samba.org/sfrench/cifs-2.6: cifs: Move the 'pid' from the subreq to the req cifs: Only pick a channel once per read request cifs: Defer read completion cifs: fix typo in module parameter enable_gcm_256 cifs: drop the incorrect assertion in cifs_swap_rw() --- d14f2780f0552edac67c24ac8868d44b2b1022a3