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@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpIrTUWji75g.pgp
Description: PGP signature
