* linux-next: manual merge of the sparc tree with the fixes tree
@ 2011-05-23 2:21 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2011-05-23 2:21 UTC (permalink / raw)
To: David Miller; +Cc: linux-next, linux-kernel, Sam Ravnborg, Daniel Hellstrom
[-- Attachment #1: Type: text/plain, Size: 523 bytes --]
Hi David,
Today's linux-next merge of the sparc tree got conflicts in
arch/sparc/include/asm/smp_32.h and arch/sparc/kernel/smp_32.c between
commit 951d04e4ef43 ("sparc32: fix build, move inline function to .c
file") from the fixes tree and commit d6d048192b1d ("sparc32: implement
SMP IPIs using the generic functions") from the sparc tree.
The latter seems to supercede to former, so I used the latter.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-05-23 2:21 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-23 2:21 linux-next: manual merge of the sparc tree with the fixes 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;
as well as URLs for NNTP newsgroup(s).