Re: linux-next: manual merge of the kbuild tree with the mm-nonmm-unstable tree

[Mark Brown]

On Mon, Oct 05, 2026 at 03:14:17PM +0200, Nathan Chancellor wrote:

> That said, I fail to see where the conflict comes from between these
> changes. They don't touch the same area in init/Kconfig. If I pull
> mm-nonmm-unstable into kbuild-for-next, I don't get a conflict in
> init/Kconfig at all, I only get the one in scripts/kallsyms.c that was
> mentioned in another thread. Is something else going on here?

Yeah, I was confused about what git was complaining about with this one
too.

Attachment: signature.asc
Description: PGP signature