linux-kernel - Re: linux-next: manual merge of the net-next tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAMuHMdVouviP6mUmTd1b1uvkmZWYXinECOvOLr-y-z-7C46cdA@mail.gmail.com>
Date:   Fri, 2 Oct 2020 09:32:52 +0200
From:   Geert Uytterhoeven <geert@...ux-m68k.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Geert Uytterhoeven <geert+renesas@...der.be>,
        Lad Prabhakar <prabhakar.mahadev-lad.rj@...renesas.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Marian-Cristian Rotariu 
        <marian-cristian.rotariu.rb@...renesas.com>
Subject: Re: linux-next: manual merge of the net-next tree with the net tree

Hi Stephen,

On Fri, Oct 2, 2020 at 5:02 AM Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> Today's linux-next merge of the net-next tree got a conflict in:
>
>   Documentation/devicetree/bindings/net/renesas,ravb.txt
>
> between commit:
>
>   307eea32b202 ("dt-bindings: net: renesas,ravb: Add support for r8a774e1 SoC")
>
> from the net tree and commit:
>
>   d7adf6331189 ("dt-bindings: net: renesas,etheravb: Convert to json-schema")
>
> from the net-next tree.
>
> I fixed it up (I deleted the file and added the following patch) 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@...b.auug.org.au>
> Date: Fri, 2 Oct 2020 12:57:33 +1000
> Subject: [PATCH] fix up for "dt-bindings: net: renesas,ravb: Add support for r8a774e1 SoC"
>
> Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>

Thank you, that resolution looks good to me!

Reviewed-by: Geert Uytterhoeven <geert+renesas@...der.be>

> --- a/Documentation/devicetree/bindings/net/renesas,etheravb.yaml
> +++ b/Documentation/devicetree/bindings/net/renesas,etheravb.yaml
> @@ -31,6 +31,7 @@ properties:
>                - renesas,etheravb-r8a774a1     # RZ/G2M
>                - renesas,etheravb-r8a774b1     # RZ/G2N
>                - renesas,etheravb-r8a774c0     # RZ/G2E
> +              - renesas,etheravb-r8a774e1     # RZ/G2H
>                - renesas,etheravb-r8a7795      # R-Car H3
>                - renesas,etheravb-r8a7796      # R-Car M3-W
>                - renesas,etheravb-r8a77961     # R-Car M3-W+
> --
> 2.28.0

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@...ux-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