On Fri, 21 Feb 2014, Ralf Baechle wrote: > On Mon, Feb 17, 2014 at 11:09:45AM -0500, Nicolas Pitre wrote: > > > I noticed commit c0b5d598aefda in linux-next adds a call to > > cpuidle_idle_call(). At the same time we're rationalizing the idle > > handling code in order to integrate it with the scheduler proper. > > Please note that a similar patch to the one below will be necessary once > > everything gets merged together. > > So how shall we merge this patch, shall I fold it into c0b5d598aefda or? Merging it on your side is probably the best option. There would be a window in mainline during which the callback registered with cpuidle won't be invoked, but that is not worse than the v3.13 behavior. Nicolas