All of lore.kernel.org
 help / color / mirror / Atom feed
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Olof Johansson <olof@lixom.net>,  Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Robert Marko <robert.marko@sartura.hr>,
	Jason Cooper <jason@lakedaemon.net>,
	Gregory Clement <gregory.clement@bootlin.com>,
	Andrew Lunn <andrew@lunn.ch>
Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Tue, 10 May 2022 15:59:05 +0200	[thread overview]
Message-ID: <5ca7ddc9-dfe6-a897-a0b7-09d04316cf28@linaro.org> (raw)
In-Reply-To: <20220510094102.099d5e54@canb.auug.org.au>

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

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: ARM <linux-arm-kernel@lists.infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Robert Marko <robert.marko@sartura.hr>,
	Jason Cooper <jason@lakedaemon.net>,
	Gregory Clement <gregory.clement@bootlin.com>,
	Andrew Lunn <andrew@lunn.ch>
Subject: Re: linux-next: manual merge of the mvebu tree with the arm-soc tree
Date: Tue, 10 May 2022 15:59:05 +0200	[thread overview]
Message-ID: <5ca7ddc9-dfe6-a897-a0b7-09d04316cf28@linaro.org> (raw)
In-Reply-To: <20220510094102.099d5e54@canb.auug.org.au>

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

  reply	other threads:[~2022-05-10 14:00 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-09 23:41 linux-next: manual merge of the mvebu tree with the arm-soc tree Stephen Rothwell
2022-05-09 23:41 ` Stephen Rothwell
2022-05-10 13:59 ` Krzysztof Kozlowski [this message]
2022-05-10 13:59   ` Krzysztof Kozlowski
2022-05-10 14:42   ` Arnd Bergmann
2022-05-10 14:42     ` Arnd Bergmann
  -- strict thread matches above, loose matches on Subject: below --
2018-05-16 22:47 Stephen Rothwell
2018-05-16 22:47 ` Stephen Rothwell
2017-04-11 22:34 Stephen Rothwell
2017-04-11 22:34 ` Stephen Rothwell
2017-04-12  8:23 ` Gregory CLEMENT
2017-04-12  8:23   ` Gregory CLEMENT
2017-04-12 10:51   ` Stephen Rothwell
2017-04-12 10:51     ` Stephen Rothwell
2016-04-13 23:29 Stephen Rothwell
2016-04-13 23:29 ` Stephen Rothwell
2016-04-13 23:29 ` Stephen Rothwell
2016-02-17 23:33 Stephen Rothwell
2016-02-17 23:33 ` Stephen Rothwell
2016-02-17 23:33 ` Stephen Rothwell
2015-12-02 11:12 Mark Brown
2015-12-02 11:12 ` Mark Brown
2015-12-02 11:12 ` Mark Brown
2015-12-02 11:18 ` Mark Brown
2015-12-02 11:18   ` Mark Brown
2015-12-02 11:21   ` Arnd Bergmann
2015-12-02 11:21     ` Arnd Bergmann
2015-12-02 13:49     ` Gregory CLEMENT
2015-12-02 13:49       ` Gregory CLEMENT
2015-12-02 15:09       ` Arnd Bergmann
2015-12-02 15:09         ` Arnd Bergmann
2015-10-31 23:35 Stephen Rothwell
2015-10-31 23:35 ` Stephen Rothwell
2015-10-31 23:35 ` Stephen Rothwell
2015-01-13  0:20 Stephen Rothwell
2015-01-13  0:20 ` Stephen Rothwell
2015-01-13  0:20 ` Stephen Rothwell
2015-01-13  1:05 ` Andrew Lunn
2015-01-13  1:05   ` Andrew Lunn
2014-05-06  1:07 Stephen Rothwell
2014-05-06  1:07 ` Stephen Rothwell
2014-05-06  1:07 ` Stephen Rothwell
2014-05-06  1:13 ` Olof Johansson
2014-05-06  1:13   ` Olof Johansson
2014-05-06  1:13   ` Olof Johansson
2014-03-18  0:21 Stephen Rothwell
2014-03-18  0:21 ` Stephen Rothwell
2014-03-18  0:21 ` Stephen Rothwell
2014-02-26  1:46 Stephen Rothwell
2014-02-26  1:46 ` Stephen Rothwell
2014-02-26  1:46 ` Stephen Rothwell
2013-08-19  6:05 Stephen Rothwell
2013-08-19  6:05 ` Stephen Rothwell
2013-08-19  6:05 ` Stephen Rothwell
2013-08-19 20:57 ` Jason Cooper
2013-08-19 20:57   ` Jason Cooper
2013-08-19 21:09   ` Olof Johansson
2013-08-19 21:09     ` Olof Johansson
2013-08-19 21:09     ` Olof Johansson
2013-08-19 21:38     ` Jason Cooper
2013-08-19 21:38       ` Jason Cooper
2013-08-19 21:38       ` Jason Cooper

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5ca7ddc9-dfe6-a897-a0b7-09d04316cf28@linaro.org \
    --to=krzysztof.kozlowski@linaro.org \
    --cc=andrew@lunn.ch \
    --cc=arnd@arndb.de \
    --cc=gregory.clement@bootlin.com \
    --cc=jason@lakedaemon.net \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=olof@lixom.net \
    --cc=robert.marko@sartura.hr \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.