From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tejun Heo <tj@kernel.org>, Rusty Russell <rusty@rustcorp.com.au>,
Christoph Lameter <cl@linux-foundation.org>,
Ingo Molnar <mingo@elte.hu>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>
Subject: linux-next: manual merge of the percpu tree with Linus' tree
Date: Mon, 29 Jun 2009 15:33:29 +1000 [thread overview]
Message-ID: <20090629153329.309e0420.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/mn10300/kernel/vmlinux.lds.S between commit
2e8b5a09ebf1f98f02c1988a48415e89d4c25168 ("MN10300: Fix the vmlinux
ldscript") from Linus' tree and commit
405d967dc70002991f8fc35c20e0d3cbc7614f63 ("linker script: throw
away .discard section") from the percpu tree.
Just context changes. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/mn10300/kernel/vmlinux.lds.S
index c96ba3d,5d9f2f9..0000000
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@@ -117,7 -145,8 +117,8 @@@ SECTION
/* Sections to be discarded */
/DISCARD/ : {
- *(.exitcall.exit)
+ EXIT_CALL
+ *(.discard)
}
STABS_DEBUG
next reply other threads:[~2009-06-29 5:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-29 5:33 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2009-07-01 7:19 linux-next: manual merge of the percpu tree with Linus' tree Stephen Rothwell
2009-07-01 7:25 Stephen Rothwell
2009-09-07 8:22 Stephen Rothwell
2009-09-07 8:36 ` Tejun Heo
2009-09-07 10:24 ` Stephen Rothwell
2009-10-30 8:20 Stephen Rothwell
2009-10-30 10:02 ` Tejun Heo
2009-10-31 4:23 ` 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=20090629153329.309e0420.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=cl@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rusty@rustcorp.com.au \
--cc=tj@kernel.org \
/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