From: Christoph Hellwig <hch@lst.de>
To: Mark Brown <broonie@kernel.org>
Cc: Jens Axboe <axboe@kernel.dk>,
Christian Brauner <brauner@kernel.org>,
Christoph Hellwig <hch@lst.de>, Keith Busch <kbusch@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 vfs-brauner tree
Date: Thu, 5 Mar 2026 15:54:28 +0100 [thread overview]
Message-ID: <20260305145428.GA17884@lst.de> (raw)
In-Reply-To: <aamIvIWiZDDCmNYG@sirena.org.uk>
On Thu, Mar 05, 2026 at 01:44:28PM +0000, Mark Brown wrote:
> 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.
>
> I don't have a huge degree of confidence in this merge as the block
> change was quite large and the code is entirely unfamiliar to me.
I'm familiar with the code and looking at this I have a hard time
understanding the merge. I think we need to get both of these changes
into the same branch somehow to properly audit and test it.
next prev parent reply other threads:[~2026-03-05 14:54 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-05 13:44 linux-next: manual merge of the block tree with the vfs-brauner tree Mark Brown
2026-03-05 14:54 ` Christoph Hellwig [this message]
2026-03-05 15:18 ` Mark Brown
2026-03-05 17:34 ` Keith Busch
2026-03-06 14:22 ` Christoph Hellwig
2026-03-09 13:45 ` Jens Axboe
2026-03-09 13:48 ` Jens Axboe
2026-03-09 13:54 ` Jens Axboe
2026-03-10 6:26 ` Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2025-11-17 3:32 Stephen Rothwell
2024-06-28 17:59 Mark Brown
2024-06-28 17:59 Mark Brown
2024-06-29 10:05 ` Christian Brauner
2024-06-29 14:28 ` Jens Axboe
2024-05-08 3:02 Stephen Rothwell
2024-05-08 6:46 ` Christoph Hellwig
2024-04-02 0:21 Stephen Rothwell
2024-02-06 1:48 Stephen Rothwell
2024-02-06 16:37 ` Jens Axboe
2024-02-07 9:27 ` Christian Brauner
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=20260305145428.GA17884@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=brauner@kernel.org \
--cc=broonie@kernel.org \
--cc=kbusch@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