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

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

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

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  drivers/pci/controller/dwc/pcie-qcom.c

between commit:

  0cc13256b605 ("PCI: qcom: Remove ASPM L0s support for MSM8996 SoC")

from the pci-current tree and commits:

  7c29cd0fdc07 ("PCI: qcom: Remove MSI-X Capability for Root Ports")
  6a1394990902 ("PCI: qcom: Remove DPC Extended Capability")

from the pci tree.

I fixed it up (I think - see below) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/controller/dwc/pcie-qcom.c
index 5a318487b2b3,9b7cffc891d3..000000000000
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@@ -1315,8 -1317,9 +1316,11 @@@ static int qcom_pcie_host_init(struct d
  			goto err_disable_phy;
  	}
  
 +	qcom_pcie_clear_aspm_l0s(pcie->pci);
 +
+ 	dw_pcie_remove_capability(pcie->pci, PCI_CAP_ID_MSIX);
+ 	dw_pcie_remove_ext_capability(pcie->pci, PCI_EXT_CAP_ID_DPC);
+ 
  	qcom_ep_reset_deassert(pcie);
  
  	if (pcie->cfg->ops->config_sid) {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]