Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: manual merge of the pm tree with the pci tree | Date | Mon, 18 Feb 2013 13:28:30 +0100 |
| |
Hi Stephen,
On Monday, February 18, 2013 12:17:07 PM Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in > drivers/acpi/scan.c between commits 668192b67820 ("PCI: acpiphp: Move > host bridge hotplug to pci_root.c") and ab1a2e038ff2 ("ACPI / PCI: Make > pci_slot built-in only, not a module") from the pci tree and commits > 4daeaf68379f ("ACPI / PCI: Make PCI IRQ link driver use struct > acpi_scan_handler") and 3757b94802fb ("ACPI / hotplug: Fix concurrency > issues and memory leaks") from the pm tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Thanks for the notice and the fix (which is the right one).
Rafael
-- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
| |