From nobody Tue Dec 2 02:05:19 2025 Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 05ECC277CAB for ; Thu, 20 Nov 2025 04:06:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763611609; cv=none; b=aLbduPO9eixyzLqrPJvceqSXwBWVnM+GI2ZQCmjnY2t9uBxfYpFuJ1N0Trm1j0dMTd9mbldcL01Pm/E9dk8OdUjafIoGedmNiT4G3dW91AzVGyQ/GPUPoHBkfo4t0sD09i8vnXScM2th8Ejst7sN3/3C+Ln8rhcLbQINmRZFKog= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763611609; c=relaxed/simple; bh=RJq4SiXsVAje4k87uYkGMUWo2W9LQq0cIi27cxCSFc0=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=A6dLp9U0Szu+6vvF64iRR5yaJO3J39JPDMe7kl7a7eFR9LNPhNI3Gg50d5QRgfaIm6h7fye1+FDX4zK+jK5dC9GSIR8V2XJFBcarc7JQKUyvg5lkAkYriH9sCSdwgdFogXR5WDFWYogIJpxtY9dkxT5InVKl/HFoBq10m8wAFb4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=pX9+dsDJ; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="pX9+dsDJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=202503; t=1763611605; bh=wEc7zSvQ1n6S5H5lDVrLm28TBPQwVvqoYIh9KFcZSe0=; h=Date:From:To:Cc:Subject:From; b=pX9+dsDJS1ZItsguEF1uDdWA+axfN3HQvG6ujwtCLI9w0FCzEa18pDTFMwmuh4qSL RoHc1IKlslQWj/b4LEd1SvakQfU0Hj2qa5Ew9LzKJbVHmDmOZ+x/gW2BodTJXzY9y1 GwhXrgAY4BupWiHTHBMlmalO+ZWc2s2iPG1ujI15A1t1/C17oNXDfptiIybXaz3Wjm 2v+38pkpwPi/6aw+rjWXVf0m+SB7M68HM63A7C7oG6BXDK8eKhn6VHfLzc7zrxc6y6 JQIWGw80nAcBmusfy2tX2egoW/FbopcjNEyssha06bptiy/vZCMbiSpKuo90cX6Li3 ZMXcNRZEUJ20w== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange secp256r1 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4dBlCm6Ljpz4wCp; Thu, 20 Nov 2025 15:06:44 +1100 (AEDT) Date: Thu, 20 Nov 2025 15:06:44 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Kevin Hilman , Neil Armstrong Cc: Linux Kernel Mailing List , Xianwei Zhao Subject: linux-next: manual merge of the tip tree with the amlogic tree Message-ID: <20251120150644.1ac4db74@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/5L5M=3I6Q2JwDvduyhFUjem"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/5L5M=3I6Q2JwDvduyhFUjem Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi between commit: 070fcd4448a1 ("arm64: dts: amlogic: s7: add ao secure node") from the amlogic tree and commit: c864e6872127 ("arm64: dts: amlogic: Add gpio_intc node for Amlogic S7 SoC= s") from the tip tree. I fixed it up (see below) 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. --=20 Cheers, Stephen Rothwell diff --cc arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi index dd7e3de2a53d,2cb00906b132..000000000000 --- a/arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi +++ b/arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi @@@ -222,13 -212,15 +222,23 @@@ }; }; =20 + gpio_intc: interrupt-controller@4080 { + compatible =3D "amlogic,s7-gpio-intc", + "amlogic,meson-gpio-intc"; + reg =3D <0x0 0x4080 0x0 0x20>; + interrupt-controller; + #interrupt-cells =3D <2>; + amlogic,channel-interrupts =3D + <10 11 12 13 14 15 16 17 18 19 20 21>; + }; ++ + ao-secure@10220 { + compatible =3D "amlogic,s7-ao-secure", + "amlogic,meson-gx-ao-secure", + "syscon"; + reg =3D <0x0 0x10220 0x0 0x140>; + amlogic,has-chip-id; + }; }; }; }; --Sig_/5L5M=3I6Q2JwDvduyhFUjem Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmkek9QACgkQAVBC80lX 0GzhwQf/ealTv4+mSX+z/vmF/g+JphRsW502DN6qaNQ2JZ5uo1ZymYPCScIFUESC gNziyuf9X8UUrucFraigzf4oVUd3ZbHhXi+XbIP+F9GL0G+M3aLbH/2g6xqPuEBb 8PhDQOQUViOeoCea7H97CQZBFlpRyVn62OZ3bRDbJzEdlcSJLWjEkM4q6rxxTZ/5 RyDtl4etKblxvQNYbfcTASrbKo18k6ycBHb6zBZVa/1Y4o5QYkBGL9ZPv1QfldUj lAHHa6GjRQ1FzDZFeGlYaUE15JEMDplNYR9JShrLy3z+doTYiM4H8JO7SFRZqaca sGfjTAFLu0myxi6ZtIW6fVacVMSsmw== =SfhT -----END PGP SIGNATURE----- --Sig_/5L5M=3I6Q2JwDvduyhFUjem--