Subject: Re: linux-next: manual merge of the pm tree with the pci tree

From: "Rafael J. Wysocki" <[email-masked]>
Date: Wed, 30 Jan 2013 13:48:47 +0100

Hi,

On Wednesday, January 30, 2013 07:35:51 PM Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/internal.h between commit 668192b67820 ("PCI: acpiphp: Move
> host bridge hotplug to pci_root.c") from the pci tree and commit
> 2c545601d933 ("ACPI / PCI: Make PCI root driver use struct
> acpi_scan_handler") from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for resolving the conflict, that's the right fix.

Rafael

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.