lkml.org 
[lkml]   [2009]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [SFI-devel] linux-next: manual merge of the sfi tree with the acpi tree
On Mon, 17 Aug 2009, Stephen Rothwell wrote:

> Hi all,
>
> Today's linux-next merge of the sfi tree got a conflict in
> drivers/acpi/tables.c between commit
> 44043a4299724bb386ac7915a57a18b176e9df07 ("ACPI: check acpi_disabled in
> acpi_table_parse()") from the acpi tree and commit
> 55ec50ee899aa3199c126bb4b740abb9a4ab51df ("ACPI: check acpi_disabled in
> acpi_table_parse() and acpi_table_parse_entries()") from the sfi tree.
>
> I used the sfi tree version.

thanks.
this should be fixed now, and both trees should again include
the identical commits where they overlap.

-Len Brown, Intel Open Source Technology Center



\
 
 \ /
  Last update: 2009-08-29 01:51    [W:0.095 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site