Re: linux-next: build failure after merge of the block tree

Mark Brown
2026-03-06T14:29:01Z

[-- Attachment #1: Type: text/plain, Size: 907 bytes --]

On Fri, Mar 06, 2026 at 09:13:33AM -0500, Jens Axboe wrote:
> On Mar 6, 2026, at 9:09 AM, Mark Brown <broonie@kernel.org> wrote:

> > I suspect I ought to be applying a merge fixup however since the block
> > tree obviously isn't intended to be in the state it's in anyway I've
> > merged the version from 20260305 for now instead.
> > <signature.asc>

> What branch are you merging? rw_iter is just a test branch. Next should only be merging my for-next branch. I’ll check later if I messed up, if the above commit is in my for-next by some accident, just drop my tree for today and I’ll take a look later when I’m on my laptop.

It's the for-next branch, the current HEAD of which is the merge
e356b1868a62cf4a650b451a7296ea4762038666. The first parent of that is
the fixup commit, the second is a merge up of block-7.0. Looks like the
fixup ended up on the wrong branch perhaps?

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]