From: Matthew Wilcox <willy@infradead•org>
To: Mark Brown <broonie@kernel•org>
Cc: Jens Axboe <axboe@kernel•dk>,
Andrew Morton <akpm@linux-foundation•org>,
David Carlier <devnexen@gmail•com>,
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 mm-stable tree
Date: Mon, 1 Jun 2026 18:44:04 +0100 [thread overview]
Message-ID: <ah3E5CV6pZO7kq07@casper.infradead.org> (raw)
In-Reply-To: <ah26UmcBXVJMy-Cc@sirena.org.uk>
On Mon, Jun 01, 2026 at 05:58:58PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> mm/page_io.c
>
> between commit:
>
> d590df11be0f1 ("mm/page_io: rename swap_iocb fields for clarity")
>
> from the mm-stable tree and commit:
>
> ca36c1aaee095 ("block: Add bvec_folio()")
>
> from the block tree.
Thanks; your resolution is clearly correct. If it'd be easier, we can
just drop the hunk touching mm/page_io.c from the block tree and I can
submit a separate patch next merge window to the mm tree. But the
resolution seems straightforward enough that maybe just keep it.
next prev parent reply other threads:[~2026-06-01 17:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-01 16:58 linux-next: manual merge of the block tree with the mm-stable tree Mark Brown
2026-06-01 17:44 ` Matthew Wilcox [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-11-11 2:52 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=ah3E5CV6pZO7kq07@casper.infradead.org \
--to=willy@infradead$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=broonie@kernel$(echo .)org \
--cc=devnexen@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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