| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20090629153329.309e0420.sfr@canb.auug.org.au>
Date: Mon, 29 Jun 2009 15:33:29 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Tejun Heo <tj@...nel.org>, Rusty Russell <rusty@...tcorp.com.au>,
Christoph Lameter <cl@...ux-foundation.org>,
Ingo Molnar <mingo@...e.hu>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
David Howells <dhowells@...hat.com>
Subject: linux-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/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@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists