lkml.org 
[lkml]   [2022]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [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

\
 
 \ /
  Last update: 2022-05-27 20:46    [W:0.033 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site