Subject: linux-next: manual merge of the modules tree with the kbuild tree

From: Mark Brown <[email-masked]>
Date: Sun, 15 Sep 2019 23:05:49 +0100

Hi all,

Today's linux-next merge of the modules tree got a conflict in:

  scripts/Makefile.modpost

between commit:

  9b9a3f20cbe0ba ("kbuild: split final module linking out into Makefile.modfinal")

from the kbuild tree and commit:

  eb8305aecb958e ("cripts: Coccinelle script for namespace dependencies.")

from the modules 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 scripts/Makefile.modpost
index 9800a3988f23e,743fe3a2e885f..0000000000000
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
diff --git a/scripts/Makefile.modfinal b/scripts/Makefile.modfinal
index 411c1e600e7dd..c164d644138ab 100644
--- a/scripts/Makefile.modfinal
+++ b/scripts/Makefile.modfinal
@@ -42,6 +42,8 @@ $(modules): %.ko: %.o %.mod.o $(KBUILD_LDS_MODULE) FORCE
 
 targets += $(modules) $(modules:.ko=.mod.o)
 
+nsdeps: __modpost
+
 # Add FORCE to the prequisites of a target to force it to be always rebuilt.
 # ---------------------------------------------------------------------------