From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Matthias Brugger <matthias.bgg@gmail•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Erin Lo <erin.lo@mediatek•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Fabien Parent <fparent@baylibre•com>
Subject: linux-next: manual merge of the mediatek tree with Linus' tree
Date: Wed, 24 Apr 2019 09:09:07 +1000 [thread overview]
Message-ID: <20190424090907.4221e701@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1496 bytes --]
Hi all,
Today's linux-next merge of the mediatek tree got a conflict in:
Documentation/devicetree/bindings/serial/mtk-uart.txt
between commit:
898a737c8a43 ("dt-bindings: serial: Add compatible for Mediatek MT8183")
from Linus' tree and commit:
61a640143f68 ("dt-bindings: serial: mtk-uart: add support for MT8516")
from the mediatek tree.
I fixed it up (see below) 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
diff --cc Documentation/devicetree/bindings/serial/mtk-uart.txt
index bcfb13194f16,ca7e9dc83087..000000000000
--- a/Documentation/devicetree/bindings/serial/mtk-uart.txt
+++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt
@@@ -16,7 -17,7 +17,8 @@@ Required properties
* "mediatek,mt8127-uart" for MT8127 compatible UARTS
* "mediatek,mt8135-uart" for MT8135 compatible UARTS
* "mediatek,mt8173-uart" for MT8173 compatible UARTS
+ * "mediatek,mt8183-uart", "mediatek,mt6577-uart" for MT8183 compatible UARTS
+ * "mediatek,mt8516-uart" for MT8516 compatible UARTS
* "mediatek,mt6577-uart" for MT6577 and all of the above
- reg: The base address of the UART register bank.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2019-04-23 23:09 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190424090907.4221e701@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=erin.lo@mediatek$(echo .)com \
--cc=fparent@baylibre$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=matthias.bgg@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