Subject: linux-next: manual merge of the tty tree with the devicetree tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 2 Jun 2020 15:48:24 +1000

Hi all,

Today's linux-next merge of the tty tree got a conflict in:

  Documentation/devicetree/bindings/serial/rs485.yaml

between commit:

  9f60a65bc5e6 ("dt-bindings: Clean-up schema indentation formatting")

from the devicetree tree and commit:

  01c38ecff8b1 ("dt-bindings: serial: Add binding for rs485 bus termination GPIO")

from the tty 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/rs485.yaml
index 8141e4aad530,a9ad17864889..000000000000
--- a/Documentation/devicetree/bindings/serial/rs485.yaml
+++ b/Documentation/devicetree/bindings/serial/rs485.yaml
@@@ -39,6 -41,9 +39,10 @@@ properties
      $ref: /schemas/types.yaml#/definitions/flag
  
    rs485-rx-during-tx:
 -   description: enables the receiving of data even while sending data.
 -   $ref: /schemas/types.yaml#/definitions/flag
 +    description: enables the receiving of data even while sending data.
 +    $ref: /schemas/types.yaml#/definitions/flag
+ 
+   rs485-term-gpios:
+     description: GPIO pin to enable RS485 bus termination.
+     maxItems: 1
 +...