Hi all,


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

  drivers/pci/controller/pcie-apple.c

between commit:

  3f1ccd6e85d7 ("PCI: apple: Abstract register offsets via a SoC-specific structure")

from the pci tree and commit:

  5d627a9484ec ("PCI: apple: Convert to MSI parent infrastructure")

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/controller/pcie-apple.c
index c3fb2c1cc103,3d412a931774..000000000000
--- a/drivers/pci/controller/pcie-apple.c
+++ b/drivers/pci/controller/pcie-apple.c
@@@ -183,8 -134,6 +184,7 @@@ struct apple_pcie 
  	struct mutex		lock;
  	struct device		*dev;
  	void __iomem            *base;
 +	const struct hw_info	*hw;
- 	struct irq_domain	*domain;
  	unsigned long		*bitmap;
  	struct list_head	ports;
  	struct completion	event;

Hi all,

On Wed, 21 May 2025 16:16:56 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/pci/controller/pcie-apple.c
> 
> between commit:
> 
>   3f1ccd6e85d7 ("PCI: apple: Abstract register offsets via a SoC-specific structure")
> 
> from the pci tree and commit:
> 
>   5d627a9484ec ("PCI: apple: Convert to MSI parent infrastructure")
> 
> 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.
> 
> 
> diff --cc drivers/pci/controller/pcie-apple.c
> index c3fb2c1cc103,3d412a931774..000000000000
> --- a/drivers/pci/controller/pcie-apple.c
> +++ b/drivers/pci/controller/pcie-apple.c
> @@@ -183,8 -134,6 +184,7 @@@ struct apple_pcie 
>   	struct mutex		lock;
>   	struct device		*dev;
>   	void __iomem            *base;
>  +	const struct hw_info	*hw;
> - 	struct irq_domain	*domain;
>   	unsigned long		*bitmap;
>   	struct list_head	ports;
>   	struct completion	event;

This is now a conflict between the pci tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell