linux-kernel - linux-next: manual merge of the cxl tree with the pci tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Wed, 19 Apr 2023 20:22:16 +0100
From:   broonie@...nel.org
To:     Dan Williams <dan.j.williams@...el.com>
Cc:     Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Bjorn Helgaas <bhelgaas@...gle.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Lukas Wunner <lukas@...ner.de>,
        Mika Westerberg <mika.westerberg@...ux.intel.com>
Subject: linux-next: manual merge of the cxl tree with the pci tree

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'