linux-next: manual merge of the mm tree with Linus' tree

Stephen Rothwell
2022-05-26T06:09:08Z

[-- Attachment #1: Type: text/plain, Size: 1839 bytes --]

Hi all,

Today's linux-next merge of the mm tree got conflicts in:

init/Kconfig
lib/Kconfig.debug

between commit:

5cf909c553e9 ("mm/slub: use stackdepot to save stack trace in objects")

from Linus' tree and commit:

21445ae47041 ("mm: Kconfig: reorganize misplaced mm options")

from the mm tree.

I fixed it up (I used the latter version of this file and applied the
following merge fix patch) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 May 2022 16:05:37 +1000
Subject: [PATCH] fix up for "mm: Kconfig: reorganize misplaced mm options"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
mm/Kconfig.debug | 2 ++
1 file changed, 2 insertions(+)

diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index 197eb287bf82..ce8dded36de9 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -57,6 +57,7 @@ config SLUB_DEBUG
default y
bool "Enable SLUB debugging support" if EXPERT
depends on SLUB && SYSFS
+ select STACKDEPOT if STACKTRACE_SUPPORT
help
SLUB has extensive debug support features. Disabling these can
result in significant savings in code size. This also disables
@@ -66,6 +67,7 @@ config SLUB_DEBUG
config SLUB_DEBUG_ON
bool "SLUB debugging on by default"
depends on SLUB && SLUB_DEBUG
+ select STACKDEPOT_ALWAYS_INIT if STACKTRACE_SUPPORT
default n
help
Boot with debugging on by default. SLUB boots by default with
--
2.35.1

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]