Messages in this thread | | | Date | Thu, 26 Nov 2009 13:22:28 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the acpi tree with the pci tree |
| |
Hi Len,
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. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |