Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20211029132411.1bd856b0@canb.auug.org.au>
In-Reply-To: <20211029132411.1bd856b0@canb.auug.org.au>
From:   Rob Herring <robherring2@gmail.com>
Date:   Fri, 29 Oct 2021 08:45:37 -0500
Message-ID: <CAL_JsqKNsvc-JqTcTGM134rHzpaibnT21HpCwzhJNA8_a8Rydg@mail.gmail.com>
Subject: Re: linux-next: manual merge of the devicetree tree with the pci tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Bjorn Helgaas <bhelgaas@google.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
        Simon Xue <xxm@rock-chips.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, Oct 28, 2021 at 9:24 PM Stephen Rothwell <sfr@canb.auug.org.au> 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