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

Stephen Rothwell
2022-05-09T23:44:49Z

[-- Attachment #1: Type: text/plain, Size: 776 bytes --]

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. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

--
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]