* linux-next: manual merge of the sfi tree with the acpi tree
@ 2009-08-17 8:06 Stephen Rothwell
2009-08-28 23:47 ` [SFI-devel] " Len Brown
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2009-08-17 8:06 UTC (permalink / raw)
To: sfi-devel; +Cc: linux-next, linux-kernel, Len Brown
[-- Attachment #1: Type: text/plain, Size: 518 bytes --]
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.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [SFI-devel] linux-next: manual merge of the sfi tree with the acpi tree
2009-08-17 8:06 linux-next: manual merge of the sfi tree with the acpi tree Stephen Rothwell
@ 2009-08-28 23:47 ` Len Brown
0 siblings, 0 replies; 2+ messages in thread
From: Len Brown @ 2009-08-28 23:47 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: sfi-devel, linux-next, linux-kernel
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-08-28 23:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-17 8:06 linux-next: manual merge of the sfi tree with the acpi tree Stephen Rothwell
2009-08-28 23:47 ` [SFI-devel] " Len Brown
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox