On Fri, May 27, 2022 at 10:30 AM Andrew Morton
<akpm@xxxxxxxxxxxxxxxxxxxx> wrote:
>
> There's a merge conflict in init/Kconfig. We resolved that by removing
> the VM_EVENT_COUNTERS..MMAP_ALLOW_UNINITIALIZED entries.
>
> And another in lib/Kconfig.debug. Similarly resolved by removing the
> DEBUG_SLAB..SLUB_STATS entries.
Both of those also needed fixups for the new mm/Kconfig.debug thing to
enable the proper STACKDEPOT things.
Linus
