lkml.org 
[lkml]   [2011]   [Feb]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the tip tree with the acpi tree
Date
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!


\
 
 \ /
  Last update: 2011-02-24 11:33    [W:0.020 / U:0.232 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site