linux-next: manual merge of the pci tree with the arm-soc tree

Stephen Rothwell
2022-12-04T22:57:53Z

[-- Attachment #1: Type: text/plain, Size: 495 bytes --]

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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]