From: Pavel Begunkov <asml.silence@gmail.com>
To: Mark Brown <broonie@kernel.org>, Jens Axboe <axboe@kernel.dk>
Cc: Daniel Borkmann <daniel@iogearbox.net>,
David Wei <dw@davidwei.uk>, Jakub Kicinski <kuba@kernel.org>,
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 block tree with the net-next tree
Date: Fri, 10 Apr 2026 14:51:58 +0100 [thread overview]
Message-ID: <cf8d351d-31f5-43aa-bf42-3e8c15650d78@gmail.com> (raw)
In-Reply-To: <adjrToW4h60zwxVG@sirena.co.uk>
On 4/10/26 13:21, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> io_uring/zcrx.c
>
> between commit:
>
> 222b5566a02dbf ("net: Proxy netdev_queue_get_dma_dev for leased queues")
It's the first time I see this commit, but the resolution looks
correct, thanks
> from the net-next tree and commit:
>
> 06fc3b6d388dfa ("io_uring/zcrx: extract netdev+area init into a helper")
>
> from the block tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
...
--
Pavel Begunkov
next prev parent reply other threads:[~2026-04-10 13:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-10 12:21 linux-next: manual merge of the block tree with the net-next tree Mark Brown
2026-04-10 13:51 ` Pavel Begunkov [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-28 3:49 Stephen Rothwell
2023-06-13 2:59 Stephen Rothwell
2023-06-27 2:00 ` Stephen Rothwell
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=cf8d351d-31f5-43aa-bf42-3e8c15650d78@gmail.com \
--to=asml.silence@gmail.com \
--cc=axboe@kernel.dk \
--cc=broonie@kernel.org \
--cc=daniel@iogearbox.net \
--cc=dw@davidwei.uk \
--cc=kuba@kernel.org \
--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