public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Cc: hpa@zytor.com, linux-kernel@vger.kernel.org,
	torvalds@linux-foundation.org, peterz@infradead.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, 22 May 2014 10:41:35 +0200	[thread overview]
Message-ID: <20140522084135.GA30094@gmail.com> (raw)
In-Reply-To: <1591569.1rC3xo6G18@vostro.rjw.lan>


* Rafael J. Wysocki <rjw@rjwysocki.net> wrote:

> On Thursday, May 08, 2014 01:39:14 PM Rafael J. Wysocki wrote:
> > On Thursday, May 08, 2014 03:47:40 AM tip-bot for Peter Zijlstra wrote:
> > > Commit-ID:  37352273ad48f2d177ed1b06ced32d5536b773fb
> > > Gitweb:     http://git.kernel.org/tip/37352273ad48f2d177ed1b06ced32d5536b773fb
> > > Author:     Peter Zijlstra <peterz@infradead.org>
> > > AuthorDate: Fri, 11 Apr 2014 13:55:48 +0200
> > > Committer:  Ingo Molnar <mingo@kernel.org>
> > > CommitDate: Thu, 8 May 2014 09:16:59 +0200
> > > 
> > > sched/idle: Reflow cpuidle_idle_call()
> > > 
> > > Apply goto to reduce lines and nesting levels.
> > 
> > Well, I have a couple of patches that will conflict with this.
> > 
> > This one in particular:
> > 
> > https://patchwork.kernel.org/patch/4071541/
> > 
> > which unfortunately already is in my linux-next branch, because I was
> > unaware of this work.
> > 
> > I wonder how we can resolve this?
> 
> 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.

Pulled into the scheduler tree, thanks Rafael!

	Ingo

      parent reply	other threads:[~2014-05-22  8:41 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
2014-05-08 16:49         ` Peter Zijlstra
2014-05-22  8:41     ` Ingo Molnar [this message]

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=20140522084135.GA30094@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