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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130110112836.19126ca740c8e13a15860dc0@canb.auug.org.au>
Date:	Thu, 10 Jan 2013 11:28:36 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	"Rafael J. Wysocki" <rjw@...k.pl>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Yinghai Lu <yinghai@...nel.org>,
	Bjorn Helgaas <bhelgaas@...gle.com>
Subject: linux-next: manual merge of the pm tree with the pci tree

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

Content of type "application/pgp-signature" skipped