Subject: linux-next: manual merge of the mediatek tree with Linus' tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 24 Apr 2019 09:09:07 +1000

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.