From: broonie@kernel•org
To: Dan Williams <dan.j.williams@intel•com>
Cc: Andy Shevchenko <andriy.shevchenko@linux•intel.com>,
Bjorn Helgaas <bhelgaas@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Lukas Wunner <lukas@wunner•de>,
Mika Westerberg <mika.westerberg@linux•intel.com>
Subject: linux-next: manual merge of the cxl tree with the pci tree
Date: Wed, 19 Apr 2023 20:22:16 +0100 [thread overview]
Message-ID: <20230419192216.149588-1-broonie@kernel.org> (raw)
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'
reply other threads:[~2023-04-19 19:23 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230419192216.149588-1-broonie@kernel.org \
--to=broonie@kernel$(echo .)org \
--cc=andriy.shevchenko@linux$(echo .)intel.com \
--cc=bhelgaas@google$(echo .)com \
--cc=dan.j.williams@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lukas@wunner$(echo .)de \
--cc=mika.westerberg@linux$(echo .)intel.com \
/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