From: Mark Brown <broonie@kernel.org>
To: Steve French <smfrench@gmail.com>
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>
Subject: linux-next: manual merge of the ksmbd tree with the cifs tree
Date: Thu, 25 Sep 2025 13:22:39 +0100 [thread overview]
Message-ID: <aNU0D_3x5WC9qBzQ@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
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.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-09-25 12:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-25 12:22 Mark Brown [this message]
2025-09-25 15:39 ` linux-next: manual merge of the ksmbd tree with the cifs tree Steve French
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=aNU0D_3x5WC9qBzQ@sirena.org.uk \
--to=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=metze@samba.org \
--cc=smfrench@gmail.com \
--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