Subject: linux-next: manual merge of the percpu tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 29 Jun 2009 15:33:29 +1000

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                    [email-masked]

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