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

[Rafael J. Wysocki]

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@xxxxxxxxxxxxx>
> > AuthorDate: Fri, 11 Apr 2014 13:55:48 +0200
> > Committer:  Ingo Molnar <mingo@xxxxxxxxxx>
> > 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.

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/