mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* linux-next: manual merge of the acpi tree with the pci tree
@ 2009-11-26  2:22 Stephen Rothwell
  2009-11-30 22:26 ` Bjorn Helgaas
  0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2009-11-26  2:22 UTC (permalink / raw)
  To: Len Brown
  Cc: linux-next, linux-kernel, Lin Ming, Bob Moore, Bjorn Helgaas,
	Jesse Barnes

[-- Attachment #1: Type: text/plain, Size: 655 bytes --]

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/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2009-12-02  4:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-26  2:22 linux-next: manual merge of the acpi tree with the pci tree Stephen Rothwell
2009-11-30 22:26 ` Bjorn Helgaas
2009-12-01 20:40   ` Bjorn Helgaas
2009-12-02  4:01     ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®