Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: manual merge of the tip tree with the acpi tree | Date | Thu, 24 Feb 2011 11:29:52 +0100 |
| |
On Thursday, February 24, 2011, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the tip tree got a conflict in > arch/x86/kernel/acpi/sleep.c between commit > a69fa313606a51cee99d802c14895330948f60c8 ("ACPI / PM: Drop > acpi_restore_state_mem()") from the acpi tree and commit > d1ee433539ea5963a8f946f3428b335d1c5fdb20 ("x86, trampoline: Use the > unified trampoline setup for ACPI wakeup") from the tip tree. > > Just context (I think).
Yes. The ACPI tree renames a function that the x86 tree modifies.
> I fixed it up (see below) and can carry the fix as necessary.
Please do, thanks!
| |