Re: [GIT PULL] PCI changes for v6.2

[Linus Torvalds]

On Tue, Dec 13, 2022 at 3:30 PM Bjorn Helgaas <helgaas@xxxxxxxxxx> wrote:
>
> You will see a merge conflict in
> Documentation/devicetree/bindings/pci/snps,dw-pcie.yaml between these:
>
>   5c3741492d2e ("dt-bindings: PCI: tegra234: Add ECAM support")
>   4cc13eedb892 ("dt-bindings: PCI: dwc: Add reg/reg-names common properties")
>
> 5c3741492d2e is already in your tree via arm-soc, and 4cc13eedb892 is in
> this pull request.  The resolution I suggest is to use 4cc13eedb892, which
> means we'll lose the addition of "ecam" from 5c3741492d2e.

Heh. I only read this part once I had already resolved that thing differently.

I dunno, I used my own - possibly bad - judgment to add a case for
that 'ecam' thing under the vendor-specific list.

That was very much a "monkey see, monkey do" resolution, so some DT
person should check it out and possibly make fun of me and my dubious
ancestry. Rob? Thierry?

                  Linus