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

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1503 bytes --]

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

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

diff --cc drivers/acpi/pci_root.c
index dcbe966,22a8458..0000000
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@@ -632,28 -600,8 +600,10 @@@ static int acpi_pci_root_add(struct acp
  	if (device->wakeup.flags.run_wake)
  		device_set_run_wake(root->bus->bridge, true);
  
- 	return 0;
- 
- out_del_root:
- 	mutex_lock(&acpi_pci_root_lock);
- 	list_del(&root->node);
- 	mutex_unlock(&acpi_pci_root_lock);
- 
- 	acpi_pci_irq_del_prt(root->segment, root->secondary.start);
- end:
- 	kfree(root);
- 	return result;
- }
- 
- static int acpi_pci_root_start(struct acpi_device *device)
- {
- 	struct acpi_pci_root *root = acpi_driver_data(device);
- 	struct acpi_pci_driver *driver;
- 
 -	if (system_state != SYSTEM_BOOTING)
 +	if (system_state != SYSTEM_BOOTING) {
 +		pcibios_resource_survey_bus(root->bus);
  		pci_assign_unassigned_bus_resources(root->bus);
 +	}
  
  	mutex_lock(&acpi_pci_root_lock);
  	list_for_each_entry(driver, &acpi_pci_drivers, node)

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]