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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in:

  arch/arm64/boot/dts/marvell/cn9130-db.dts

between commit:

  054bc6a105d7 ("arm/arm64: dts: Fix remaining dtc 'unit_address_format' warnings")

from the arm-soc-fixes tree and commit:

  4c43a41e5b8c ("arm64: dts: cn913x: add device trees for topology B boards")

from the arm-soc tree.

I fixed it up (used this file from the latter and applied the following
merge resolution patch) 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.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 24 Aug 2021 09:44:25 +1000
Subject: [PATCH] arm64: dts: cn913x: fixup for ("arm/arm64: dts: Fix remaining dtc 'unit_address_format' warnings"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
index 2cd4bb09e8ff..c00b69b88bd2 100644
--- a/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
+++ b/arch/arm64/boot/dts/marvell/cn9130-db.dtsi
@@ -25,7 +25,7 @@ aliases {
 		spi2 = &cp0_spi1;
 	};
 
-	memory@00000000 {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x0 0x0 0x80000000>;
 	};
-- 
2.32.0

-- 
Cheers,
Stephen Rothwell

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