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

[Rafael J. Wysocki]

Hi,

On Thursday, January 10, 2013 11:28:36 AM Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in
> drivers/acpi/pci_root.c between commit 3c449ed00759 ("PCI/ACPI: Reserve
> firmware-allocated resources for hot-added root buses") from the pci tree
> and commit 47525cda88f5 ("ACPI / PCI: Fold acpi_pci_root_start() into
> acpi_pci_root_add()") from the pm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for the fixup and please carry it for now (the conflict should go away
when Bjorn pulls from my acpi-scan branch).

Thanks,
Rafael


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/