From: Rob Herring <robherring2@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>,
Aswath Govindraju <a-govindraju@ti.com>,
Bartosz Golaszewski <bgolaszewski@baylibre.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the devicetree tree
Date: Wed, 23 Jun 2021 11:26:56 -0600 [thread overview]
Message-ID: <CAL_JsqL+4FqU=jexFiXVLN-782N+Qh6DJLYoXZGitTYY2ULRBw@mail.gmail.com> (raw)
In-Reply-To: <20210622181624.57527651@canb.auug.org.au>
On Tue, Jun 22, 2021 at 2:16 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
> Documentation/devicetree/bindings/gpio/gpio-davinci.txt
>
> between commit:
>
> c601eef1e258 ("dt-bindings: clock: update ti,sci-clk.yaml references")
>
> from the devicetree tree and commit:
>
> c830b87a761b ("dt-bindings: gpio: gpio-davinci: Convert to json-schema")
>
> from the gpio-brgl tree.
>
> I fixed it up (the latter removed the file, so I did that) and can
> carry the fix as necessary.
As the reference is gone in the schema, that is the correct resolution.
Rob
next prev parent reply other threads:[~2021-06-23 17:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-22 8:16 linux-next: manual merge of the gpio-brgl tree with the devicetree tree Stephen Rothwell
2021-06-23 17:26 ` Rob Herring [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-04 8:54 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_JsqL+4FqU=jexFiXVLN-782N+Qh6DJLYoXZGitTYY2ULRBw@mail.gmail.com' \
--to=robherring2@gmail.com \
--cc=a-govindraju@ti.com \
--cc=bgolaszewski@baylibre.com \
--cc=brgl@bgdev.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mchehab+huawei@kernel.org \
--cc=sfr@canb.auug.org.au \
/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).