linux-kernel - Re: linux-next: manual merge of the ksmbd tree with the cifs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAH2r5mt_TXXsrik3HPFBfSOcVm9Azu4Qprj5ps51S5VXGet3tA@mail.gmail.com>
Date: Thu, 25 Sep 2025 10:39:36 -0500
From: Steve French <smfrench@...il.com>
To: Mark Brown <broonie@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, 
	Linux Next Mailing List <linux-next@...r.kernel.org>, Stefan Metzmacher <metze@...ba.org>, 
	Steve French <stfrench@...rosoft.com>, Namjae Jeon <linkinjeon@...nel.org>, 
	CIFS <linux-cifs@...r.kernel.org>
Subject: Re: linux-next: manual merge of the ksmbd tree with the cifs tree

I have updated cifs-2.6.git for-next to remove the duplicate patch
(that was already in ksmbd-for-next), and have updated ksmbd-for-next
(somewhat fewer patches, and he has reordered them to be less
confusing, and fixed the missing Signed-off-by).   Should be ok now

On Thu, Sep 25, 2025 at 7:22 AM Mark Brown <broonie@...nel.org> wrote:
>
> Hi all,
>
> Today's linux-next merge of the ksmbd tree got conflicts in:
>
>   fs/smb/client/smbdirect.h
>   fs/smb/client/smbdirect.c
>
> between commit:
>
>   8c78e78d99355 ("smb: client: fix sending the iwrap custom IRD/ORD negotiation messages")
>
> from the cifs tree and commits:
>
>   4e152f2732650 ("smb: client: make use of smbdirect_connection_negotiate_rdma_resources()")
>   c0a6d2d41a3b6 ("smb: client: initialize recv_io->cqe.done = recv_done just once")
>   d5b264e469201 ("smb: client: fix sending the iwrap custom IRD/ORD negotiation messages")
>   8435735745f65 ("smb: client: make use of smbdirect_socket_parameters.{initiator_depth,responder_resources}")
>
> from the ksmbd tree.
>
> I don't feel equipped to sensibly resolve this today and there's also a
> missing signoff in the ksmbd tree, I've used the version of the ksmbd tree
> from yesterday and will hopefully have the time to look at this
> tomorrow.



-- 
Thanks,

Steve