From: Ingo Molnar <mingo@kernel.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>,
hpa@zytor.com, linux-kernel@vger.kernel.org,
torvalds@linux-foundation.org, nicolas.pitre@linaro.org,
tglx@linutronix.de, daniel.lezcano@linaro.org,
linux-tip-commits@vger.kernel.org
Subject: Re: [tip:sched/core] sched/idle: Reflow cpuidle_idle_call()
Date: Thu, 8 May 2014 18:33:46 +0200 [thread overview]
Message-ID: <20140508163346.GA9330@gmail.com> (raw)
In-Reply-To: <20140508120826.GT11096@twins.programming.kicks-ass.net>
* Peter Zijlstra <peterz@infradead.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
next prev parent reply other threads:[~2014-05-08 16:33 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-08 10:47 [tip:sched/core] sched/idle: Reflow cpuidle_idle_call() tip-bot for Peter Zijlstra
2014-05-08 11:39 ` Rafael J. Wysocki
2014-05-08 11:41 ` Rafael J. Wysocki
2014-05-08 12:03 ` Peter Zijlstra
2014-05-08 11:56 ` Rafael J. Wysocki
2014-05-08 12:08 ` Peter Zijlstra
2014-05-08 16:33 ` Ingo Molnar [this message]
2014-05-08 16:49 ` Peter Zijlstra
2014-05-22 8:41 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140508163346.GA9330@gmail.com \
--to=mingo@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=nicolas.pitre@linaro.org \
--cc=peterz@infradead.org \
--cc=rjw@rjwysocki.net \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox