[lkml]   [2009]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subjectlinux-next: manual merge of the percpu tree with Linus' tree
Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/mn10300/kernel/ 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.
Stephen Rothwell

diff --cc arch/mn10300/kernel/
index c96ba3d,5d9f2f9..0000000
--- a/arch/mn10300/kernel/
+++ b/arch/mn10300/kernel/
@@@ -117,7 -145,8 +117,8 @@@ SECTION

/* Sections to be discarded */
- *(.exitcall.exit)
+ *(.discard)


 \ /
  Last update: 2009-06-29 07:35    [W:0.016 / U:8.696 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site