linux-kernel - Re: linux-next: manual merge of the mvebu tree with the arm-soc 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: <CAK8P3a0N0EGGY7RQR2BBXk1RzUjRw9hwZmzYvKXjFb6M8kq3dw@mail.gmail.com>
Date:   Tue, 10 May 2022 16:42:41 +0200
From:   Arnd Bergmann <arnd@...db.de>
To:     Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Robert Marko <robert.marko@...tura.hr>,
        Jason Cooper <jason@...edaemon.net>,
        Gregory Clement <gregory.clement@...tlin.com>,
        Andrew Lunn <andrew@...n.ch>
Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree

On Tue, May 10, 2022 at 3:59 PM Krzysztof Kozlowski
<krzysztof.kozlowski@...aro.org> wrote:
> On 10/05/2022 01:41, Stephen Rothwell wrote:
>
> This conflict will come to you when Gregory sends Marvel SoC pull request.
>
> The correct resolution is to take my commit 2f00bb4a69c7 ("arm64: dts:
> marvell: align SPI NOR node name with dtschema"), so the node name
> should be "flash", not "spi-flash".

Ok, thanks for the heads-up!

       Arnd