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

From: Stephen Rothwell <[email-masked]>
Date: Fri, 23 May 2025 13:23:43 +1000

Hi all,

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

  drivers/pci/pci.h

between commits:

  51f6aec99cb0 ("PCI: Remove hybrid devres nature from request functions")
  8e9987485d9a ("PCI: Remove pcim_request_region_exclusive()")
  dfc970ad6197 ("PCI: Remove function pcim_intx() prototype from pci.h")

from the pci tree and commit:

  d5124a9957b2 ("PCI/MSI: Provide a sane mechanism for TPH")

from the tip 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.h
index e39a2a5df587,39f368d2f26d..000000000000
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -1105,6 -1059,20 +1105,15 @@@ static inline pci_power_t mid_pci_get_p
  }
  #endif
  
 -int pcim_intx(struct pci_dev *dev, int enable);
 -int pcim_request_region_exclusive(struct pci_dev *pdev, int bar,
 -				  const char *name);
 -void pcim_release_region(struct pci_dev *pdev, int bar);
 -
+ #ifdef CONFIG_PCI_MSI
+ int pci_msix_write_tph_tag(struct pci_dev *pdev, unsigned int index, u16 tag);
+ #else
+ static inline int pci_msix_write_tph_tag(struct pci_dev *pdev, unsigned int index, u16 tag)
+ {
+ 	return -ENODEV;
+ }
+ #endif
+ 
  /*
   * Config Address for PCI Configuration Mechanism #1
   *