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

[Rob Herring]

On Thu, Oct 28, 2021 at 9:24 PM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Hi all,
>
> Today's linux-next merge of the devicetree tree got a conflict in:
>
>   Documentation/devicetree/bindings/pci/rockchip-dw-pcie.yaml
>
> between commit:
>
>   af7cda832f8a ("dt-bindings: rockchip: Add DesignWare based PCIe controller")
>
> from the pci tree and commit:
>
>   ad854f362e8c ("dt-bindings: rockchip: Add DesignWare based PCIe controller")
>
> from the devicetree tree.
>
> These were almost identical patches.  I went with the former one sonce
> it was dated later.

I've dropped it from my tree.

Rob