[git pull] Consolidate cpuidle functionality

Rob Lee rob.lee at linaro.org
Mon Mar 12 18:45:15 UTC 2012

Len and Andrew,

Please consider this an official merge request of this cpuidle
patchset for v3.4.

There were two small conflicts Stephen Rothwell found when merging to
linux-next.  The first conflict is with patch 1/9 in the
drivers/cpuidle/cpuidle.c file which is trivially to resolve.  I'm
told this fixup is trivially enough to not require anyone to carry it.

The second is with patch 2/9 in mach-at91/cpuidle.c due to some minor
cleanup changes.  The fix is also pretty simple but I'm waiting to
hear back about who will carry it.

Please let me know if you need any other action or information on my part.


On Fri, Mar 9, 2012 at 12:40 AM, Stephen Rothwell <sfr at canb.auug.org.au> wrote:
> Hi Rob,
> On Thu, 8 Mar 2012 19:58:23 -0600 Rob Lee <rob.lee at linaro.org> wrote:
>>   git://git.linaro.org/people/rob_lee/linux.git cpuidle_consol_pull
>> These changes move various functionality duplicated in platform
>> cpuidle drivers to the core cpuidle driver and common arch arm code. Also,
>> the irq disabling in the platform code was removed as all calls into
>> cpuidle_call_idle() will have already called local_irq_disable().
>> This patchset is bisect safe.  Also, the core cpuidle and arch changes of the
>> first commit do not require any changes to the arch and platform cpuidle
>> drivers, though those arch and platform change should be made to take
>> advantage of the new consolidation function.
>> Stephen, this patch has been reviewed, tested, and ACK'd per the list above but
>> cpuidle maintainer Len Brown has been out on vacation for a couple of weeks so
>> I am sending you this pull request as time is running out to get this into
>> v3.4.  I've had a brief communication with Andrew Morton about
>> this as well so he is aware of this situation.  I am fairly new to the
>> community so please let me know if you see anything that needs my attention or
>> anything I should be doing differently.
> I will add this tree from today.  Lets see if anyone screams.
> Thanks for adding your subsystem tree as a participant of linux-next.  As
> you may know, this is not a judgment of your code.  The purpose of
> linux-next is for integration testing and to lower the impact of
> conflicts between subsystems in the next merge window.
> You will need to ensure that the patches/commits in your tree/series have
> been:
>     * submitted under GPL v2 (or later) and include the Contributor's
>        Signed-off-by,
>     * posted to the relevant mailing list,
>     * reviewed by you (or another maintainer of your subsystem tree),
>     * successfully unit tested, and
>     * destined for the current or next Linux merge window.
> Basically, this should be just what you would send to Linus (or ask him
> to fetch).  It is allowed to be rebased if you deem it necessary.
> --
> Cheers,
> Stephen Rothwell
> sfr at canb.auug.org.au
> Legal Stuff:
> By participating in linux-next, your subsystem tree contributions are
> public and will be included in the linux-next trees.  You may be sent
> e-mail messages indicating errors or other issues when the
> patches/commits from your subsystem tree are merged and tested in
> linux-next.  These messages may also be cross-posted to the linux-next
> mailing list, the linux-kernel mailing list, etc.  The linux-next tree
> project and IBM (my employer) make no warranties regarding the linux-next
> project, the testing procedures, the results, the e-mails, etc.  If you
> don't agree to these ground rules, let me know and I'll remove your tree
> from participation in linux-next.

More information about the linaro-dev mailing list