Re: linux-next: manual merge of the mvebu tree with the arm-soc tree

Krzysztof Kozlowski
2022-05-10T14:42:23Z

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