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

Bjorn Helgaas
2022-12-13T16:21:10Z

On Mon, Dec 05, 2022 at 09:57:38AM +1100, Stephen Rothwell wrote:
> 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").

Did I miss a suggested resolution for this?