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
