From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Rusty Russell <rusty@rustcorp.com.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>
Subject: linux-next: manual merge of the modules tree with Linus' tree
Date: Thu, 4 Oct 2012 12:48:51 +1000 [thread overview]
Message-ID: <20121004124851.6704ba1ecb3d79c2a8ef5bf7@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1336 bytes --]
Hi Rusty,
Today's linux-next merge of the modules tree got a conflict in Makefile
between commit d183e6f570f3 ("UAPI: Move linux/version.h") from Linus'
tree and commit 91657140708d ("MODSIGN: Make mrproper should remove
generated files") from the modules tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc Makefile
index 5d8e7f2,e70ebfe..0000000
--- a/Makefile
+++ b/Makefile
@@@ -996,8 -993,12 +996,11 @@@ CLEAN_DIRS += $(MODVERDIR
# Directories & files removed with 'make mrproper'
MRPROPER_DIRS += include/config usr/include include/generated \
arch/*/include/generated
-MRPROPER_FILES += .config .config.old .version .old_version \
- include/linux/version.h \
+MRPROPER_FILES += .config .config.old .version .old_version $(version_h) \
- Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
+ Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
+ signing_key.priv signing_key.x509 x509.genkey \
+ extra_certificates signing_key.x509.keyid \
+ signing_key.x509.signer
# clean - Delete most, but leave enough to build external modules
#
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-10-04 2:49 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-04 2:48 Stephen Rothwell [this message]
2012-10-08 0:49 linux-next: manual merge of the modules tree with Linus' tree Stephen Rothwell
2012-10-08 2:41 ` Rusty Russell
2012-12-19 0:10 Stephen Rothwell
2012-12-19 5:38 ` Rusty Russell
2012-12-19 21:30 ` Stephen Rothwell
2013-12-19 2:51 Stephen Rothwell
2023-02-26 22:53 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=20121004124851.6704ba1ecb3d79c2a8ef5bf7@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
/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).