From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 23 Jan 2026 21:40:55 +0000 (-0800)
Subject: Merge tag 'v6.19-rc6-server-fixes' of git://git.samba.org/ksmbd
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d064432376627ff76f86e16b3fbc13c38e860c2;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'v6.19-rc6-server-fixes' of git://git.samba.org/ksmbd

Pull smb server fixes from Steve French:

 - Use the original nents value for ib_dma_unmap_sg(), preventing
   potential memory corruption in the RDMA transport layer

 - Fix a naming discrepancy in the kernel-doc for
   ksmbd_vfs_kern_path_start_removing() as identified by sparse static
   analysis

 - Reset smb_direct_port to its default value during initialization to
   ensure the correct port is used when switching between different RDMA
   device types without module reload

* tag 'v6.19-rc6-server-fixes' of git://git.samba.org/ksmbd:
  smb: server: reset smb_direct_port = SMB_DIRECT_PORT_INFINIBAND on init
  smb: server: fix comment for ksmbd_vfs_kern_path_start_removing()
  ksmbd: smbd: fix dma_unmap_sg() nents
---

6d064432376627ff76f86e16b3fbc13c38e860c2