lkml.org 
[lkml]   [2009]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the acpi tree with the pci tree
Date
On Wednesday 25 November 2009 07:22:28 pm Stephen Rothwell wrote:
> Today's linux-next merge of the acpi tree got a conflict in
> drivers/pci/hotplug/acpiphp_glue.c between commit
> 204d49a5613a06eb2fa5c3b842a29b1336cc7995 ("PCI hotplug: move IOAPIC
> support from acpiphp to ioapic driver") from the pci tree and commit
> 2263576cfc6e8f6ab038126c3254404b9fcb1c33 ("ACPICA: Add post-order
> callback to acpi_walk_namespace") from the acpi tree.
>
> The former moved part of the code modified by the latter into another
> file. All the calls to acpi_walk_namespace() seem to have been removed
> in this process.

I was on vacation last week, so couldn't respond earlier, sorry.

As you noticed, 204d49a56 removed some acpi_walk_namespace() calls.
It removed calls to the old "pre-order only" version, while 263576cfc
converted acpi_walk_namespace() to a new "pre-order and post-order"
version.

This is conceptually simple because 204d49a56 is just removing uses
of acpi_walk_namespace(), so we don't care at all whether it removes
calls to the old or new version. But I don't have enough git-fu to
know how to fix this.

Bjorn




\
 
 \ /
  Last update: 2009-11-30 23:29    [W:0.051 / U:0.304 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site