From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Thomas Gleixner" <tglx@linutronix•de>,
"Ingo Molnar" <mingo@kernel•org>,
"H. Peter Anvin" <hpa@zytor•com>,
"Peter Zijlstra" <peterz@infradead•org>,
"Bjorn Helgaas" <bhelgaas@google•com>,
"Lorenzo Pieralisi" <lpieralisi@kernel•org>,
"Krzysztof Wilczyński" <kwilczynski@kernel•org>
Cc: Alyssa Rosenzweig <alyssa@rosenzweig•io>,
Hector Martin <marcan@marcan•st>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Manivannan Sadhasivam <manivannan.sadhasivam@linaro•org>,
Marc Zyngier <maz@kernel•org>
Subject: linux-next: manual merge of the tip tree with the pci tree
Date: Wed, 21 May 2025 16:16:56 +1000 [thread overview]
Message-ID: <20250521161656.429889eb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1221 bytes --]
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;
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-05-21 6:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-21 6:16 Stephen Rothwell [this message]
2025-05-28 3:47 ` linux-next: manual merge of the tip tree with the pci tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-05-23 3:23 Stephen Rothwell
2025-05-28 3:48 ` Stephen Rothwell
2023-10-09 2:47 Stephen Rothwell
2023-10-31 23:15 ` Stephen Rothwell
2022-11-21 4:11 Stephen Rothwell
2020-11-30 4:03 Stephen Rothwell
2020-11-30 10:21 ` Borislav Petkov
2020-11-30 17:40 ` Bjorn Helgaas
2020-10-01 6:38 Stephen Rothwell
2020-10-01 16:06 ` Bjorn Helgaas
2020-09-25 5:35 Stephen Rothwell
2020-10-13 3:34 ` Stephen Rothwell
2020-09-25 5:21 Stephen Rothwell
2020-10-13 3:31 ` Stephen Rothwell
2017-06-28 3:15 Stephen Rothwell
2017-06-29 0:14 ` Christoph Hellwig
2016-12-09 2:38 Stephen Rothwell
2016-12-12 16:09 ` Bjorn Helgaas
2014-11-24 5:18 Stephen Rothwell
2014-11-24 10:51 ` Thomas Gleixner
2014-03-12 22:18 Mark Brown
2014-03-03 6:07 Stephen Rothwell
2014-03-03 6:03 Stephen Rothwell
2014-03-03 9:26 ` Liviu Dudau
2013-10-29 6:33 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250521161656.429889eb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=alyssa@rosenzweig$(echo .)io \
--cc=bhelgaas@google$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=kwilczynski@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lpieralisi@kernel$(echo .)org \
--cc=manivannan.sadhasivam@linaro$(echo .)org \
--cc=marcan@marcan$(echo .)st \
--cc=maz@kernel$(echo .)org \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox