[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20140508163346.GA9330@gmail.com>
Date: Thu, 8 May 2014 18:33:46 +0200
From: Ingo Molnar <mingo@...nel.org>
To: Peter Zijlstra <peterz@...radead.org>
Cc: "Rafael J. Wysocki" <rjw@...ysocki.net>, hpa@...or.com,
linux-kernel@...r.kernel.org, torvalds@...ux-foundation.org,
nicolas.pitre@...aro.org, tglx@...utronix.de,
daniel.lezcano@...aro.org, linux-tip-commits@...r.kernel.org
Subject: Re: [tip:sched/core] sched/idle: Reflow cpuidle_idle_call()
* Peter Zijlstra <peterz@...radead.org> 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? I can construct a merge
resolution from that.
Thanks,
Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists