From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bartosz Golaszewski <brgl@bgdev•pl>, Rob Herring <robherring2@gmail•com>
Cc: 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>,
Rob Herring <robh@kernel•org>
Subject: linux-next: manual merge of the gpio-brgl tree with the devicetree tree
Date: Tue, 22 Jun 2021 18:16:24 +1000 [thread overview]
Message-ID: <20210622181624.57527651@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 824 bytes --]
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. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-06-22 8:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-22 8:16 Stephen Rothwell [this message]
2021-06-23 17:26 ` linux-next: manual merge of the gpio-brgl tree with the devicetree tree Rob Herring
-- 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=20210622181624.57527651@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=a-govindraju@ti$(echo .)com \
--cc=bgolaszewski@baylibre$(echo .)com \
--cc=brgl@bgdev$(echo .)pl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab+huawei@kernel$(echo .)org \
--cc=robh@kernel$(echo .)org \
--cc=robherring2@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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