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: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Philipp Stanner <phasta@kernel•org>
Subject: linux-next: manual merge of the tip tree with the pci tree
Date: Fri, 23 May 2025 13:23:43 +1000 [thread overview]
Message-ID: <20250523132343.6f33b625@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1617 bytes --]
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
*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-05-23 3:23 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-23 3:23 Stephen Rothwell [this message]
2025-05-28 3:48 ` 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-21 6:16 Stephen Rothwell
2025-05-28 3:47 ` 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=20250523132343.6f33b625@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--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=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=phasta@kernel$(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