linux-kernel - linux-next: manual merge of the pci tree with the arm-soc 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20221205095738.607b9551@canb.auug.org.au>
Date:   Mon, 5 Dec 2022 09:57:38 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Bjorn Helgaas <bhelgaas@...gle.com>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:     ARM <linux-arm-kernel@...ts.infradead.org>,
        Jon Hunter <jonathanh@...dia.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Lorenzo Pieralisi <lpieralisi@...nel.org>,
        Serge Semin <Sergey.Semin@...kalelectronics.ru>,
        Thierry Reding <treding@...dia.com>,
        Vidya Sagar <vidyas@...dia.com>
Subject: linux-next: manual merge of the pci tree with the arm-soc tree

Hi all,

Today's linux-next merge of the pci tree got a conflict in:

  Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml

between commit:

  5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")

from the arm-soc tree and commit:

  4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")

from the pci tree.

I didn't know how to fix this up, so I just used the latter (and so lost
the addition of "ecam").

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped