From: Rusty Russell <rusty@rustcorp.com.au>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
James Hogan <james.hogan@imgtec.com>,
Takashi Iwai <tiwai@suse.de>
Subject: Re: linux-next: manual merge of the modules tree with Linus' tree
Date: Wed, 19 Dec 2012 16:08:08 +1030 [thread overview]
Message-ID: <87txri1u0v.fsf@rustcorp.com.au> (raw)
In-Reply-To: <20121219111053.345900e0b35ee8f4def990a7@canb.auug.org.au>
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Hi Rusty,
>
> Today's linux-next merge of the modules tree got a conflict in
> kernel/modsign_pubkey.c between commit 84ecfd15f554 ("modsign: add symbol
> prefix to certificate list") from Linus' tree and commit bb8f5966421d
> ("MODSIGN: Avoid using .incbin in C source") from the modules tree.
Gah, I had a brainfart reading gitk and thought commit was not upstream
:(
(Paul Mackerras points out that gitk shows you what branches a commit is
in, so I now have no excuse. He also offered to colour-code it for me
RSN, which would make it inescapable).
> I fixed it up (I just used the modules tree version as it removed the
> section of code modified by the former) and can carry the fix as
> necessary (no action is required).
Yes, but that leaves this turd in linux/kernel.h from
cbdbf2abb7844548a7d7a6a2ae7af6b6fbcea401:
+/* This helps us to avoid #ifdef CONFIG_SYMBOL_PREFIX */
+#ifdef CONFIG_SYMBOL_PREFIX
+#define SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
+#else
+#define SYMBOL_PREFIX ""
+#endif
I have reverted to the previous modules-next.
Thanks,
Rusty.
next prev parent reply other threads:[~2012-12-19 6:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-19 0:10 linux-next: manual merge of the modules tree with Linus' tree Stephen Rothwell
2012-12-19 5:38 ` Rusty Russell [this message]
2012-12-19 21:30 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2023-02-26 22:53 Stephen Rothwell
2013-12-19 2:51 Stephen Rothwell
2012-10-08 0:49 Stephen Rothwell
2012-10-08 2:41 ` Rusty Russell
2012-10-04 2:48 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=87txri1u0v.fsf@rustcorp.com.au \
--to=rusty@rustcorp.com.au \
--cc=james.hogan@imgtec.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=tiwai@suse.de \
/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).