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

[Stephen Rothwell]

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).

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc drivers/acpi/scan.c
index d9ee41e,daee749..0000000
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1685,10 -1778,13 +1778,14 @@@ int __init acpi_scan_init(void
                printk(KERN_ERR PREFIX "Could not register bus type\n");
        }
  
-       acpi_power_init();
        acpi_pci_root_init();
 +      acpi_pci_slot_init();
+       acpi_pci_link_init();
+       acpi_platform_init();
+       acpi_csrt_init();
+       acpi_container_init();
  
+       mutex_lock(&acpi_scan_lock);
        /*
         * Enumerate devices in the ACPI namespace.
         */
@@@ -1708,7 -1804,7 +1805,9 @@@
  
        acpi_update_all_gpes();
  
 +      acpi_pci_root_hp_init();
 +
-       return 0;
+  out:
+       mutex_unlock(&acpi_scan_lock);
+       return result;
  }

pgpP6bNk7EuGm.pgp
Description: PGP signature