[lkml]   [2013]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRE: linux-next: manual merge of the acpi tree with the pm tree
> Hi Len,
> On Mon, 11 Feb 2013 18:34:06 -0500 Len Brown <> wrote:
> >
> > BTW. Rafael's "pm" tree now carries the ACPI patch stream, so it is
> > probably a mis-representation to call my tree the "acpi" tree.
> > My tree is primarily focused on the "idle" part of pm these days.
> OK, I have renamed your tree to "idle".

Thanks for fixing the conflicts.

The new ACPICA release contains a patch renaming the PM_TIMER_FREQUENCY macro.
A further CA release patch cleans up the repo (pm/linux-next) where the release patch set based on.
The conflicts would happen if other repos contained new codes using the old macro definition.


 \ /
  Last update: 2013-02-17 09:21    [W:0.032 / U:1.416 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site