Messages in this thread | | | From | "Rafael J. Wysocki" <> | Subject | Re: linux-next: manual merge of the pm tree with the pci tree | Date | Wed, 20 Feb 2013 13:57:18 +0100 |
| |
Hi,
On Wednesday, February 20, 2013 12:55:55 PM Stephen Rothwell wrote: > Hi Rafael, > > Today's linux-next merge of the pm tree got a conflict in > drivers/pci/pci-acpi.c between commit 181380b702ee ("PCI/ACPI: Don't > cache _PRT, and don't associate them with bus numbers") from the pci tree > and commit bc9b6407bd6d ("ACPI / PM: Rework the handling of devices > depending on power resources") 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 fix.
Rafael
-- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.
| |