linux-kernel - linux-next: manual merge of the iommu tree with the pci-current 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Fri, 16 Dec 2011 13:30:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Joerg Roedel <joro@...tes.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Rafael J. Wysocki" <rjw@...k.pl>,
	Jesse Barnes <jbarnes@...tuousgeek.org>
Subject: linux-next: manual merge of the iommu tree with the pci-current
 tree

Hi Joerg,

Today's linux-next merge of the iommu tree got a conflict in
drivers/pci/hotplug/acpiphp_glue.c between commit 619a5182d1f3 ("PCI
hotplug: Always allow acpiphp to handle non-PCIe bridges") from the
pci-current tree and commit d90116ea38f7 ("PCI/ACPI: Make acpiphp ignore
root bridges using SHPC native hotplug") from the iommu tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/pci/hotplug/acpiphp_glue.c
index 9ddf69e,ba43c03..0000000
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@@ -132,18 -132,6 +132,18 @@@ register_slot(acpi_handle handle, u32 l
  	if (!acpi_pci_check_ejectable(pbus, handle) && !is_dock_device(handle))
  		return AE_OK;
  
 +	pdev = pbus->self;
 +	if (pdev && pci_is_pcie(pdev)) {
 +		tmp = acpi_find_root_bridge_handle(pdev);
 +		if (tmp) {
 +			struct acpi_pci_root *root = acpi_pci_find_root(tmp);
 +
 +			if (root && (root->osc_control_set &
- 					OSC_PCI_EXPRESS_NATIVE_HP_CONTROL))
++					OSC_PCI_NATIVE_HOTPLUG))
 +				return AE_OK;
 +		}
 +	}
 +
  	acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
  	device = (adr >> 16) & 0xffff;
  	function = adr & 0xffff;

Content of type "application/pgp-signature" skipped