Re: [GIT PULL] timer changes for v3.10

[Ingo Molnar <mingo@kernel.org>]

* Linus Torvalds <torvalds@linux-foundation.org> wrote:

> On Tue, Apr 30, 2013 at 12:43 AM, Ingo Molnar <mingo@kernel.org> wrote:
> >
> > Please pull the latest timers-core-for-linus git tree from:
> >
> >    git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers-core-for-linus
> 
> Hmm.. The "Use generic idle loop" patches from the SMP/hotplug pull 
> conflicted with the "Use tick broadcast expired check" patches in this 
> one for both x86 and ARM.
> 
> Both sets of patches were done by Thomas, and I *really* want you guys 
> to take a look at my conflict resolution. I effectively moved the new 
> "don't go into deep idle if boradcast timer is pending" check from x86 
> and arm into the generic idle loop. So my merge resolution is 
> semantically quite different from either branch, but the alternative 
> seemed to be to remove the new check entirely.
> 
> I pushed my merge out, please take a look.

It looks good to me (in fact I missed that semantic conflict when I merged 
these two myself :-/ ) - but it would be nice if Thomas double checked it 
as well.

Thanks,

	Ingo