linux-next: manual merge of the iommu tree with the pci-current tree

linux-next: manual merge of the iommu tree with the pci-current tree

[Stephen Rothwell]

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

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@canb.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;

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

Re: linux-next: manual merge of the iommu tree with the pci-current tree

[Joerg Roedel]

Hi Stephen,

On Fri, Dec 16, 2011 at 01:30:26PM +1100, Stephen Rothwell wrote:
> 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.

That's weird. This conflict is between a patch in my tree which I pulled
in from the PCI tree and another patch from the PCI tree. So any
conflict should already be solved in the PCI tree, no?

Jesse, the pri-changes branch you provided me is a subset of your
linux-next branch, right?

> I fixed it up (I think - see below) and can carry the fix as necessary.

Jesse should comment on the correctness of the fix :)


	Joerg

Re: linux-next: manual merge of the iommu tree with the pci-current tree

[Jesse Barnes]

On Fri, 16 Dec 2011 09:52:47 +0100
Joerg Roedel <joro@8bytes.org> wrote:

> Hi Stephen,
> 
> On Fri, Dec 16, 2011 at 01:30:26PM +1100, Stephen Rothwell wrote:
> > 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.
> 
> That's weird. This conflict is between a patch in my tree which I pulled
> in from the PCI tree and another patch from the PCI tree. So any
> conflict should already be solved in the PCI tree, no?
> 
> Jesse, the pri-changes branch you provided me is a subset of your
> linux-next branch, right?
> 
> > I fixed it up (I think - see below) and can carry the fix as necessary.
> 
> Jesse should comment on the correctness of the fix :)

Yeah, this is probably my fault; pri-changes has drifted relative to my
linux-next branch.  I'll rebase it onto linux-next and push again.
That should fix things.

Jesse

Re: linux-next: manual merge of the iommu tree with the pci-current tree

[Joerg Roedel]

On Fri, Dec 16, 2011 at 07:18:40AM -0800, Jesse Barnes wrote:
> Yeah, this is probably my fault; pri-changes has drifted relative to my
> linux-next branch.  I'll rebase it onto linux-next and push again.
> That should fix things.

Please don't rebase. I already pulled in the changes and don't want to
rebase that :) Can you just merge the pri-changes branch into your
linux-next branch?


	Joerg