[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250528134736.5c79411a@canb.auug.org.au>
Date: Wed, 28 May 2025 13:47:36 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Bjorn Helgaas <bhelgaas@...gle.com>, Lorenzo Pieralisi
<lpieralisi@...nel.org>, Krzysztof WilczyĆski
<kwilczynski@...nel.org>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...nel.org>,
"H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
Alyssa Rosenzweig <alyssa@...enzweig.io>, Hector Martin <marcan@...can.st>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
Mailing List <linux-next@...r.kernel.org>, Manivannan Sadhasivam
<manivannan.sadhasivam@...aro.org>, Marc Zyngier <maz@...nel.org>
Subject: Re: linux-next: manual merge of the tip tree with the pci tree
Hi all,
On Wed, 21 May 2025 16:16:56 +1000 Stephen Rothwell <sfr@...b.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
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists