From: Leon Romanovsky <leon@kernel.org>
To: Mark Brown <broonie@kernel.org>, Jason Gunthorpe <jgg@nvidia.com>
Cc: Jacob Moroni <jmoroni@google.com>, Jason Gunthorpe <jgg@ziepe.ca>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the rdma tree with the origin tree
Date: Mon, 20 Jul 2026 18:03:41 +0300 [thread overview]
Message-ID: <20260720150341.GG110966@unreal> (raw)
In-Reply-To: <al40KAaJ0Qiy-lTs@sirena.org.uk>
On Mon, Jul 20, 2026 at 03:43:52PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the rdma tree got a conflict in:
>
> drivers/infiniband/hw/irdma/verbs.c
>
> between commit:
>
> b9b0889071569 ("RDMA/irdma: Prevent user-triggered null deref on QP create")
>
> from the origin tree and commit:
>
> d83bf998f719d ("RDMA/irdma: Prevent user-triggered null deref on QP create")
Jason,
By mistake, we ended up with two identical commits: one applied by
you to rdma-rc, and the other applied by me to rdma-next.
Thanks
next prev parent reply other threads:[~2026-07-20 15:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-07-20 14:43 linux-next: manual merge of the rdma tree with the origin tree Mark Brown
2026-07-20 15:03 ` Leon Romanovsky [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-05-18 12:26 Mark Brown
2026-01-19 16:25 Mark Brown
2022-09-29 12:40 broonie
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=20260720150341.GG110966@unreal \
--to=leon@kernel.org \
--cc=broonie@kernel.org \
--cc=jgg@nvidia.com \
--cc=jgg@ziepe.ca \
--cc=jmoroni@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/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