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] [thread-next>] [day] [month] [year] [list]

Date:   Tue, 10 May 2022 15:59:05 +0200
From:   Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:     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 10/05/2022 01:41, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mvebu tree got a conflict in:
> 
>   arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
> 
> between commit:
> 
>   2f00bb4a69c7 ("arm64: dts: marvell: align SPI NOR node name with dtschema")
> 
> from the arm-soc tree and commit:
> 
>   5e9b59bd3737 ("arm64: dts: uDPU: update partition table")
> 
> from the mvebu tree.
> 
> I fixed it up (I just used the former) and can carry the fix as
> necessary.

Thanks Stephen, that's the correct resolution.

Arnd, Olof,

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".

Best regards,
Krzysztof