Hi Ingo,

On Mon, 22 Dec 2008 07:35:02 +0100 Ingo Molnar [off-list ref] wrote:

* Stephen Rothwell [off-list ref] wrote:

quoted

 +#define nmi_enter()				\
 +	do {					\
 +		ftrace_nmi_enter();		\
 +		lockdep_off();			\
++		rcu_nmi_enter();		\
 +		__irq_enter();			\
 +	} while (0)
 +#define nmi_exit()				\
 +	do {					\
 +		__irq_exit();			\
++		rcu_nmi_exit();			\
 +		lockdep_on();			\
 +		ftrace_nmi_exit();		\
 +	} while (0)

yes, that's the same resolution i did for this conflict three days ago in 
tip/master. Thanks,

This conflict is now the sched tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/