linux-next: manual merge of the riscv-dt tree with the riscv-dt-fixes tree

linux-next: manual merge of the riscv-dt tree with the riscv-dt-fixes tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the riscv-dt tree got a conflict in:

  arch/riscv/boot/dts/sophgo/cv1800b.dtsi

between commit:

  e80ed63affc9 ("riscv: dts: sophgo: remove address-cells from intc node")

from the riscv-dt-fixes tree and commit:

  5b5dce3951b2 ("riscv: dts: sophgo: Separate compatible specific for CV1800B soc")

from the riscv-dt tree.

I fixed it up (I used the latter version of his file and added the
following merge fix 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: Fri, 1 Dec 2023 08:43:13 +1100
Subject: [PATCH] fixup for "riscv: dts: sophgo: Separate compatible specific for CV1800B soc"

interacting with "riscv: dts: sophgo: remove address-cells from intc node"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 1 -
 1 file changed, 1 deletion(-)

diff --git a/arch/riscv/boot/dts/sophgo/cv18xx.dtsi b/arch/riscv/boot/dts/sophgo/cv18xx.dtsi
index d415cc758def..2d6f4a4b1e58 100644
--- a/arch/riscv/boot/dts/sophgo/cv18xx.dtsi
+++ b/arch/riscv/boot/dts/sophgo/cv18xx.dtsi
@@ -34,7 +34,6 @@ cpu0: cpu@0 {
 			cpu0_intc: interrupt-controller {
 				compatible = "riscv,cpu-intc";
 				interrupt-controller;
-				#address-cells = <0>;
 				#interrupt-cells = <1>;
 			};
 		};
-- 
2.40.1

-- 
Cheers,
Stephen Rothwell

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