From: Steve French <smfrench@gmail.com>
To: Mark Brown <broonie@kernel.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Stefan Metzmacher <metze@samba.org>,
Steve French <stfrench@microsoft.com>,
Namjae Jeon <linkinjeon@kernel.org>,
CIFS <linux-cifs@vger.kernel.org>
Subject: Re: linux-next: manual merge of the ksmbd tree with the cifs tree
Date: Thu, 25 Sep 2025 10:39:36 -0500 [thread overview]
Message-ID: <CAH2r5mt_TXXsrik3HPFBfSOcVm9Azu4Qprj5ps51S5VXGet3tA@mail.gmail.com> (raw)
In-Reply-To: <aNU0D_3x5WC9qBzQ@sirena.org.uk>
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@kernel.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
parent reply other threads:[~2025-09-25 15:39 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <aNU0D_3x5WC9qBzQ@sirena.org.uk>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAH2r5mt_TXXsrik3HPFBfSOcVm9Azu4Qprj5ps51S5VXGet3tA@mail.gmail.com \
--to=smfrench@gmail.com \
--cc=broonie@kernel.org \
--cc=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=metze@samba.org \
--cc=stfrench@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).