lkml.org 
[lkml]   [2022]   [May]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: 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@linaro.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

\
 
 \ /
  Last update: 2022-05-10 17:11    [W:0.055 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site