From: Rob Herring <robherring2@gmail.com>
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>
Subject: Re: linux-next: manual merge of the devicetree tree with the pci tree
Date: Fri, 29 Oct 2021 08:45:37 -0500 [thread overview]
Message-ID: <CAL_JsqKNsvc-JqTcTGM134rHzpaibnT21HpCwzhJNA8_a8Rydg@mail.gmail.com> (raw)
In-Reply-To: <20211029132411.1bd856b0@canb.auug.org.au>
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
next prev parent reply other threads:[~2021-10-29 13:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-29 2:24 linux-next: manual merge of the devicetree tree with the pci tree Stephen Rothwell
2021-10-29 13:45 ` Rob Herring [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-01-10 0:50 Stephen Rothwell
2020-07-28 5:49 Stephen Rothwell
2020-07-28 8:26 ` Sivaprakash Murugesan
2020-07-28 15:20 ` Rob Herring
2020-05-22 5:58 Stephen Rothwell
2018-01-25 20:34 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAL_JsqKNsvc-JqTcTGM134rHzpaibnT21HpCwzhJNA8_a8Rydg@mail.gmail.com \
--to=robherring2@gmail.com \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=sfr@canb.auug.org.au \
--cc=xxm@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).