From: Colin Cross <ccross@android.com>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Kevin Hilman <khilman@ti.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
LKML <linux-kernel@vger.kernel.org>,
Linux PM list <linux-pm@vger.kernel.org>,
Len Brown <lenb@kernel.org>,
ACPI Devel Mailing List <linux-acpi@vger.kernel.org>,
Alan Stern <stern@rowland.harvard.edu>
Subject: Re: PM: Summary of changes for v3.6
Date: Tue, 17 Jul 2012 13:53:52 -0700 [thread overview]
Message-ID: <CAMbhsRQHMu-zzkhJxYLvszQ2+=OVEJwKrCTbGCjpYGtnP-tttg@mail.gmail.com> (raw)
In-Reply-To: <201207172252.06093.rjw@sisk.pl>
On Tue, Jul 17, 2012 at 1:52 PM, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> Hi,
>
> On Tuesday, July 17, 2012, Kevin Hilman wrote:
>> Rafael, Daniel,
>>
>> "Rafael J. Wysocki" <rjw@sisk.pl> writes:
>>
>> > Hi all,
>> >
>> > All of the changes I'd like to include into the first PM pull request during
>> > the v3.6 merge window, except maybe for one or two patches I know are in the
>> > works, is on the 'linux-next' branch of the linux-pm.git tree now. The summary
>> > of those changes is appended. If anyone finds any of them objectionable,
>> > please let me know ASAP. Also please let me know if you have any power
>> > management patches you'd like me to take for v3.6.
>> >
>>
>> Could someone please clarify the status of the coupled CPUidle series?
>>
>> There's a version of these in Daniels cpuidle-next branch and there's a
>> version of these in Len's next branch (included in linux-next), but I'm
>> still not entirely sure which branch is going upstream and which branch
>> has the latest version (but I think Daniel's is the latest)
>
> Colin says that the commits in the Len's tree match his latest version,
> so I think those commits should be merged, since they have been present
> in that tree since the 3.5 merge window.
The disappeared from Len's tree for a little while after the 3.5 merge
window, which is why they started appearing other places. Now that
they have returned to Len's tree, hopefully to stay, they should be
considered the official version.
next prev parent reply other threads:[~2012-07-17 20:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-16 20:46 PM: Summary of changes for v3.6 Rafael J. Wysocki
2012-07-16 22:11 ` Kevin Hilman
2012-07-17 20:52 ` Rafael J. Wysocki
2012-07-17 20:53 ` Colin Cross [this message]
2012-07-19 4:48 ` Len Brown
2012-07-26 0:18 ` Kevin Hilman
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='CAMbhsRQHMu-zzkhJxYLvszQ2+=OVEJwKrCTbGCjpYGtnP-tttg@mail.gmail.com' \
--to=ccross@android.com \
--cc=daniel.lezcano@linaro.org \
--cc=khilman@ti.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=stern@rowland.harvard.edu \
/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;
as well as URLs for NNTP newsgroup(s).