Messages in this thread | | | From | Arnd Bergmann <> | Date | Tue, 10 May 2022 16:42:41 +0200 | 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@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
| |