* linux-next: manual merge of the cxl tree with the pci tree
@ 2023-04-19 19:22 broonie
0 siblings, 0 replies; only message in thread
From: broonie @ 2023-04-19 19:22 UTC (permalink / raw)
To: Dan Williams
Cc: Andy Shevchenko, Bjorn Helgaas, Linux Kernel Mailing List,
Linux Next Mailing List, Lukas Wunner, Mika Westerberg
Hi all,
Today's linux-next merge of the cxl tree got a conflict in:
.clang-format
between commit:
09cc900632400 ("PCI: Introduce pci_dev_for_each_resource()")
from the pci tree and commit:
74e491e5d1bcc ("PCI/DOE: Make mailbox creation API private")
from the cxl 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 .clang-format
index 2048b0296d76f,1c85f6ddc71ab..0000000000000
--- a/.clang-format
+++ b/.clang-format
@@@ -520,8 -520,6 +520,7 @@@ ForEachMacros
- 'of_property_for_each_string'
- 'of_property_for_each_u32'
- 'pci_bus_for_each_resource'
+ - 'pci_dev_for_each_resource'
- - 'pci_doe_for_each_off'
- 'pcl_for_each_chunk'
- 'pcl_for_each_segment'
- 'pcm_for_each_format'
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-19 19:23 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-19 19:22 linux-next: manual merge of the cxl tree with the pci tree broonie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox