RE: linux-next: manual merge of the acpi tree with the pm tree
From: Zheng, Lv
Date: Sun Feb 17 2013 - 02:32:13 EST
> Hi Len,
> On Mon, 11 Feb 2013 18:34:06 -0500 Len Brown <lenb@xxxxxxxxxx> 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.
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/