Subject: linux-next: manual merge of the pci tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Fri, 25 Jul 2025 11:21:51 +1000

Hi all,

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

  drivers/pci/pci.c

between commit:

  907a7a2e5bf4 ("PCI/PM: Set up runtime PM even for devices without PCI PM")

from Linus' tree and commit:

  5c0d0ee36f16 ("PCI: Support Immediate Readiness on devices without PM capabilities")

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.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/pci/pci.c
index 9e42090fb108,fbe1281073aa..000000000000
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -3266,10 -3209,6 +3209,7 @@@ void pci_pm_init(struct pci_dev *dev
  		pci_pme_active(dev, false);
  	}
  
- 	pci_read_config_word(dev, PCI_STATUS, &status);
- 	if (status & PCI_STATUS_IMM_READY)
- 		dev->imm_ready = 1;
 +poweron:
  	pci_pm_power_up_and_verify_state(dev);
  	pm_runtime_forbid(&dev->dev);
  	pm_runtime_set_active(&dev->dev);