Re: linux-next: manual merge of the sched tree

* Stephen Rothwell [off-list ref] wrote:

Hi all,

Today's linux-next merge of the sched tree got a conflict in 
kernel/rcupreempt.c between commit 
70ff05554f91a1edda1f11684da1dbde09e2feea ("Fix PREEMPT_RCU without 
HOTPLUG_CPU") from Linus' tree and commit 
4446a36ff8c74ac3b32feb009b651048e129c6af ("rcu: add call_rcu_sched()") 
from the sched tree.

The former moved rcu_online_cpu() out of the CONFIG_HOTPLUG_CPU ifdef 
and mode it __cpuinit, while the latter updated it.  I applied the 
latter updates to the newly positioned function.  This may well not be 
correct but it does build.  Please check.

yeah, that's how i resolved it too.

	Ingo