linux-next: manual merge of the devicetree tree with the watchdog tree

linux-next: manual merge of the devicetree tree with the watchdog tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]

Hi all,

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

  Documentation/devicetree/bindings/watchdog/renesas,wdt.txt

between commit:

  ff1ee6fb276c ("dt-bindings: watchdog: renesas,wdt: Document r8a7742 support")

from the watchdog tree and commit:

  d0941cfb9fa8 ("dt-bindings: watchdog: renesas-wdt: Convert to json-schema")

from the devicetree tree.

I fixed it up (I removed the file and added the patch 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 26 May 2020 15:15:51 +1000
Subject: [PATCH] dt-bindings: watchdog: renesas-wdt: fix up for yaml conversion

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
index 27e8c4accd67..572f4c912fef 100644
--- a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
@@ -24,6 +24,7 @@ properties:
 
       - items:
           - enum:
+              - renesas,r8a7742-wdt      # RZ/G1H
               - renesas,r8a7743-wdt      # RZ/G1M
               - renesas,r8a7744-wdt      # RZ/G1N
               - renesas,r8a7745-wdt      # RZ/G1E
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the devicetree tree with the watchdog tree

[Geert Uytterhoeven]

Hi Stephen,

On Tue, May 26, 2020 at 7:20 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the devicetree tree got a conflict in:
>
>   Documentation/devicetree/bindings/watchdog/renesas,wdt.txt
>
> between commit:
>
>   ff1ee6fb276c ("dt-bindings: watchdog: renesas,wdt: Document r8a7742 support")
>
> from the watchdog tree and commit:
>
>   d0941cfb9fa8 ("dt-bindings: watchdog: renesas-wdt: Convert to json-schema")
>
> from the devicetree tree.
>
> I fixed it up (I removed the file and added the patch 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.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 26 May 2020 15:15:51 +1000
> Subject: [PATCH] dt-bindings: watchdog: renesas-wdt: fix up for yaml conversion
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
> index 27e8c4accd67..572f4c912fef 100644
> --- a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
> +++ b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml
> @@ -24,6 +24,7 @@ properties:
>
>        - items:
>            - enum:
> +              - renesas,r8a7742-wdt      # RZ/G1H
>                - renesas,r8a7743-wdt      # RZ/G1M
>                - renesas,r8a7744-wdt      # RZ/G1N
>                - renesas,r8a7745-wdt      # RZ/G1E

Thank you, looks good to me.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds