From: broonie@kernel•org
To: Greentime Hu <green.hu@gmail•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Masahiro Yamada <masahiroy@kernel•org>
Subject: linux-next: manual merge of the nds32 tree with the kbuild tree
Date: Tue, 22 Feb 2022 11:45:36 +0000 [thread overview]
Message-ID: <20220222114536.743705-1-broonie@kernel.org> (raw)
Hi all,
Today's linux-next merge of the nds32 tree got a conflict in:
arch/nds32/Kbuild
between commit:
8212f8986d311 ("kbuild: use more subdir- for visiting subdirectories while cleaning")
from the kbuild tree and commit:
37160f01e8ea6 ("nds32: move core-y in arch/nds32/Makefile to arch/nds32/Kbuild")
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.
diff --cc arch/nds32/Kbuild
index ac127371afa47,565b9bc3c9db4..0000000000000
--- a/arch/nds32/Kbuild
+++ b/arch/nds32/Kbuild
diff --cc arch/nds32/Kconfig
index 013249430fa3d,a20b42d4bdb6e..0000000000000
--- a/arch/nds32/Kconfig
+++ b/arch/nds32/Kconfig
@@@ -61,6 -63,12 +60,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
next reply other threads:[~2022-02-22 11:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-22 11:45 broonie [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-10-24 22:38 linux-next: manual merge of the nds32 tree with the kbuild tree Stephen Rothwell
2022-01-17 22:00 ` Stephen Rothwell
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=20220222114536.743705-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=green.hu@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=masahiroy@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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