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

Mark Brown
2026-01-19T18:54:02Z

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

On Mon, Jan 19, 2026 at 01:18:09PM -0500, Tamir Duberstein wrote:
> On Mon, Jan 19, 2026 at 1:13 PM Mark Brown <broonie@kernel.org> wrote:
> > On Mon, Jan 19, 2026 at 06:02:20PM +0000, Mark Brown wrote:

> > > Caused by commit

> > > 4cef2fcda3ada (rnull: replace `kernel::c_str!` with C-Strings)

> > > I have used the version from 20260116 instead.

> > Actually that's been there for a while so I'll just revert the commit
> > instead.

> Ah yes, this is the combination of
> https://lore.kernel.org/all/20251222-cstr-configfs-v1-1-cc1665c51c43@gmail.com/
> and https://lore.kernel.org/all/20251222-cstr-block-v1-1-fdab28bb7367@gmail.com/
> going through different trees. With both changes, the import becomes
> unused. Can the import be removed as part of the merge commit?

I could do that as a merge fixup instead of the revert, I'll have a look
at some point but not for today. Someone will need to work out how this
works when things go to Linus...

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