On Friday, February 15, 2013 12:23:13 PM Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the pm tree got conflicts in > drivers/acpi/scan.c and drivers/pci/hotplug/acpiphp_glue.c between > commits 668192b67820 ("PCI: acpiphp: Move host bridge hotplug to > pci_root.c") and be6d2867b4f6 ("PCI: acpiphp: Remove dead code for PCI > host bridge hotplug") from the pci tree and commit 3757b94802fb ("ACPI / > hotplug: Fix concurrency issues and memory leaks") from the pm tree. > > I fixed it up (thanks to Yinghai Lu for the resolution - see below) and > can carry the fix as necessary (no action is required). Thanks Stephen! -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html