Re: PM: Summary of changes for v3.6

From: Rafael J. Wysocki
Date: Tue Jul 17 2012 - 16:46:23 EST


Hi,

On Tuesday, July 17, 2012, Kevin Hilman wrote:
> Rafael, Daniel,
>
> "Rafael J. Wysocki" <rjw@xxxxxxx> 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.

Thanks,
Rafael
--
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/