Subject: Re: linux-next: build failure after merge of the tip tree

From: Mike Galbraith <[email-masked]>
Date: Mon, 20 Jan 2014 10:17:14 +0100

On Mon, 2014-01-20 at 09:42 +0100, Sedat Dilek wrote: 
> On Mon, Jan 20, 2014 at 4:51 AM, Stephen Rothwell <[email-masked]> wrote:
> > On Sat, 18 Jan 2014 10:46:06 +0100 Mike Galbraith <[email-masked]> wrote:
> >>
> >> I hope it doesn't look quite like that, next-20140117 is -ENOBOOT on
> >> Q6600 box.  See below for an alternative.
> >>
> >> idle: kill unnecessary mwait_idle() resched IPIs
> >
> > OK, so despite even further discussion, I have applied this as a merge
> > fix patch for today.  Let me know when it is all sorted out.
> >
> 
> Where is this fix?

If you pull next-20140120, the fix is in it.

> ( Browsing Linux-next remote GIT repository online. )
> 2x NOPE for me.

Probably because it's a temporary conflict fix.

-Mike