From: Mark Brown <broonie@kernel.org>
To: Jessica Yu <jeyu@kernel.org>,
Masahiro Yamada <yamada.masahiro@socionext.com>,
Matthias Maennich <maennich@google.com>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: manual merge of the modules tree with the kbuild tree
Date: Sun, 15 Sep 2019 23:05:49 +0100 [thread overview]
Message-ID: <20190915220549.GK4352@sirena.co.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1370 bytes --]
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.
# ---------------------------------------------------------------------------
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-09-15 22:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-15 22:05 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-04 0:43 linux-next: manual merge of the modules tree with the kbuild tree Stephen Rothwell
2023-11-02 22:24 ` Stephen Rothwell
2022-05-23 2:08 Stephen Rothwell
2015-11-01 8:31 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=20190915220549.GK4352@sirena.co.uk \
--to=broonie@kernel.org \
--cc=jeyu@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maennich@google.com \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).