* linux-next: manual merge of the percpu tree with the sh tree
@ 2009-07-13 5:52 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2009-07-13 5:52 UTC (permalink / raw)
To: Tejun Heo, Rusty Russell, Christoph Lameter, Ingo Molnar
Cc: linux-next, linux-kernel, Tim Abbott
[-- Attachment #1: Type: text/plain, Size: 548 bytes --]
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/sh/kernel/vmlinux.lds.S between commit
2802e34590f290173a3f2aa5a4d662ae5373b420 ("sh: Clean up linker script
using new linker script macros") from the sh tree and commit
023bf6f1b8bf58dc4da7f0dc1cf4787b0d5297c1 ("linker script: unify usage of
discard definition") from the percpu tree.
It looks like the latter is a superset of the former, so I used it.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-07-13 5:52 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-07-13 5:52 linux-next: manual merge of the percpu tree with the sh tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox