Subject: Re: linux-next: manual merge of the acpi tree

From: "Rafael J. Wysocki" <[email-masked]>
Date: Tue, 8 Jul 2008 16:33:39 +0200

On Tuesday, 8 of July 2008, Stephen Rothwell wrote:
> Hi Len,
> 
> Today's linux-next merge of the acpi tree got conflicts in
> drivers/pci/pci.c and drivers/pci/pci.h between commit
> 961d9120fa6f078492a1c762dd91f2c097e56c83 ("PCI: Introduce
> platform_pci_power_manageable function") from the pci tree and commit
> d40f76ca5c165c9ff1490bbbdb34c520d7155c1f ("PCI ACPI: Drop the second
> argument of platform_pci_choose_state") from the acpi tree (which is also
> in the pci tree).
> 
> The former removes the code that the latter modifies.

It should be safe to drop commit d40f76ca5c165c9ff1490bbbdb34c520d7155c1f
("PCI ACPI: Drop the second argument of platform_pci_choose_state") from the
ACPI tree.

Should I prepare a revert patch?

Rafael