* linux-next: manual merge of the nds32 tree with Linus' tree
@ 2021-09-08 23:52 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2021-09-08 23:52 UTC (permalink / raw)
To: Greentime Hu
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Masahiro Yamada, Randy Dunlap, Steven Rostedt (VMware)
[-- Attachment #1: Type: text/plain, Size: 1101 bytes --]
Hi all,
Today's linux-next merge of the nds32 tree got a conflict in:
arch/nds32/Kconfig
between commit:
4aae683f1327 ("tracing: Refactor TRACE_IRQFLAGS_SUPPORT in Kconfig")
from Linus' tree and commit:
36b9b1975393 ("nds32: add a Kconfig symbol for LOCKDEP_SUPPORT")
from the nds32 tree.
I fixed it up (see below) 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.
--
Cheers,
Stephen Rothwell
diff --cc arch/nds32/Kconfig
index aea26e739543,a20b42d4bdb6..000000000000
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@@ -63,6 -63,12 +62,9 @@@ config GENERIC_LOCKBREA
def_bool y
depends on PREEMPTION
+ config LOCKDEP_SUPPORT
+ def_bool y
+
-config TRACE_IRQFLAGS_SUPPORT
- def_bool y
-
config STACKTRACE_SUPPORT
def_bool y
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-08 23:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-08 23:52 linux-next: manual merge of the nds32 tree with Linus' tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).