linux-kernel - linux-next: manual merge of the pci tree with the origin 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>] [day] [month] [year] [list]

Message-ID: <aXDT53ca9FrHELdS@sirena.org.uk>
Date: Wed, 21 Jan 2026 13:25:59 +0000
From: Mark Brown <broonie@...nel.org>
To: Bjorn Helgaas <bhelgaas@...gle.com>,
	Lorenzo Pieralisi <lpieralisi@...nel.org>,
	Krzysztof Wilczyński <kwilczynski@...nel.org>
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Manivannan Sadhasivam <mani@...nel.org>,
	Manivannan Sadhasivam <manivannan.sadhasivam@....qualcomm.com>,
	Qiang Yu <qiang.yu@....qualcomm.com>,
	Wenbin Yao <wenbin.yao@....qualcomm.com>
Subject: linux-next: manual merge of the pci tree with the origin tree

Hi all,

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

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

between commit:

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

from the origin tree and commits:

  8d8db7dbf2181 ("PCI: qcom: Rename PERST# assert/deassert helpers for uniformity")
  6a1394990902f ("PCI: qcom: Remove DPC Extended Capability")
  7c29cd0fdc07e ("PCI: qcom: Remove MSI-X Capability for Root Ports")

from the pci tree.

I fixed it up (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.

diff --cc drivers/pci/controller/dwc/pcie-qcom.c
index 5a318487b2b3f,41baed591a4a8..0000000000000
--- a/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@@ -1312,12 -1311,13 +1310,15 @@@ static int qcom_pcie_host_init(struct d
  	if (pcie->cfg->ops->post_init) {
  		ret = pcie->cfg->ops->post_init(pcie);
  		if (ret)
- 			goto err_disable_phy;
+ 			goto err_pwrctrl_power_off;
  	}
  
 +	qcom_pcie_clear_aspm_l0s(pcie->pci);
 +
- 	qcom_ep_reset_deassert(pcie);
+ 	dw_pcie_remove_capability(pcie->pci, PCI_CAP_ID_MSIX);
+ 	dw_pcie_remove_ext_capability(pcie->pci, PCI_EXT_CAP_ID_DPC);
+ 
+ 	qcom_pcie_perst_deassert(pcie);
  
  	if (pcie->cfg->ops->config_sid) {
  		ret = pcie->cfg->ops->config_sid(pcie);

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)