Messages in this thread | | | Date | Tue, 17 May 2011 13:14:35 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the sparc tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in arch/sparc/kernel/smp_32.c between commit d6d048192b1d ("sparc32: implement SMP IPIs using the generic functions") from the sparc tree and commit 184748cc50b2 ("sched: Provide scheduler_ipi() callback in response to smp_send_reschedule()") from the tip tree.
I fixed it up (I am pretty sure that the sparc tree patch supercedes the tip tree one) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |