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

From: Ingo Molnar <[email-masked]>
Date: Mon, 22 Dec 2008 07:35:02 +0100

* Stephen Rothwell <[email-masked]> wrote:

>  +#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,

	Ingo