Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35;
Date:   Fri, 1 Dec 2023 08:47:15 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Conor Dooley <Conor.Dooley@microchip.com>
Cc:     Inochi Amaoto <inochiama@outlook.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the riscv-dt tree with the
 riscv-dt-fixes tree
Message-ID: <20231201084715.11edd814@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/ygxXbF.zZVQRrzdGe2cOBJQ";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/ygxXbF.zZVQRrzdGe2cOBJQ
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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 CV180=
0B 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 specifi=
c 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/s=
ophgo/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 =3D "riscv,cpu-intc";
 				interrupt-controller;
-				#address-cells =3D <0>;
 				#interrupt-cells =3D <1>;
 			};
 		};
--=20
2.40.1

--=20
Cheers,
Stephen Rothwell

--Sig_/ygxXbF.zZVQRrzdGe2cOBJQ
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVpAuMACgkQAVBC80lX
0GzG4wgAoOVTnujhByAtTrxoTWrpadvbQUICioJ25Xr5gdlmotHMfGsZTC/O9adO
ioqNP2eBLQSt0It1ez9Rajnn1tvANC8E4CaU/2o+fsrcx/59j7V5ElnMZ9RMLBDx
E/KWmkFn0Y8bP0Y9UUeDYoa7iKri29RlBuub94AB7dpSNt132J7vOTA3WPmfkW8R
3KYUWx4rXzcfTVdspwPLoLGKs8CzJK8/gUO7pK49HSnRl7sYa2vRb79PVTHUFrya
wXz2QOaBgHLtlOa7Ji06LawF0/eDiZtqmSZlEcbikh5RGevasPgGNI8VP9uzz0wH
lZv7kBj7MLxj4IcEoLqh1J2pBHaMrQ==
=1+6H
-----END PGP SIGNATURE-----

--Sig_/ygxXbF.zZVQRrzdGe2cOBJQ--