Re: [tip:sched/core] sched/idle: Reflow cpuidle_idle_call()

From: Peter Zijlstra
Date: Thu May 08 2014 - 12:49:30 EST


On Thu, May 08, 2014 at 06:33:46PM +0200, Ingo Molnar wrote:
>
> * Peter Zijlstra <peterz@xxxxxxxxxxxxx> wrote:
>
> > On Thu, May 08, 2014 at 01:56:18PM +0200, Rafael J. Wysocki wrote:
> > > The cpuidle patches I have queued up so far are on this separate branch
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm-cpuidle
> > >
> > > in case you'd like to pull from there.
> >
> > Ingo, can you do that? I think the patch I just posted should be
> > enough to fix up the conflict.
>
> Yeah, sounds good to me, I'll pull it into sched/core.
>
> The patch you posted is essentially a replacement for:
>
> 52c324f8a87b cpuidle: Combine cpuidle_enabled() with cpuidle_select()
>
> when it's done on top of sched/core, right?

tip/master actually, but yes.

Attachment: pgpbnIFewlQoH.pgp
Description: PGP signature