Messages in this thread | | | From | Linus Torvalds <> | Date | Fri, 27 May 2022 11:44:47 -0700 | Subject | Re: [GIT PULL] additional MM updates for 5.19-rc1 |
| |
On Fri, May 27, 2022 at 10:30 AM Andrew Morton <akpm@linux-foundation.org> 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
| |