From: Linus Torvalds <torvalds@linux-foundation.org>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Linux-MM <linux-mm@kvack.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
mm-commits@vger.kernel.org
Subject: Re: [GIT PULL] additional MM updates for 5.19-rc1
Date: Fri, 27 May 2022 11:44:47 -0700 [thread overview]
Message-ID: <CAHk-=wi72yLMW6vrnCpGJCO8Sj35miJMH74dWu2kJ0bYD1P42w@mail.gmail.com> (raw)
In-Reply-To: <20220527103014.517818624f9f6d4f0ba0b523@linux-foundation.org>
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
next prev parent reply other threads:[~2022-05-27 18:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-27 17:30 Andrew Morton
2022-05-27 18:44 ` Linus Torvalds [this message]
2022-05-27 18:48 ` pr-tracker-bot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAHk-=wi72yLMW6vrnCpGJCO8Sj35miJMH74dWu2kJ0bYD1P42w@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mm-commits@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox