From patchwork Thu Nov 30 21:47:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 172134 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp705016vqy; Thu, 30 Nov 2023 13:47:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IGiVyyUrmTMr8L0ZkAdYtX/v3k1TZo0EgcQ/YM1sz1X1HlgDNd5EjKyqQAhpNXq19bohfEz X-Received: by 2002:a05:6a20:3948:b0:18a:e003:21aa with SMTP id r8-20020a056a20394800b0018ae00321aamr24250663pzg.13.1701380855812; Thu, 30 Nov 2023 13:47:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701380855; cv=none; d=google.com; s=arc-20160816; b=OBDfkCBktbsqnyWHBWlK01f0PtZLxGx9LhimFlZovSgva6SowkQl+cT96V0zyUd01K n6HHFNyxhQJ3LUMt3DI10ng9RXB2LDe7cP9BJwX9laWch/lkZqYAc0442tuWpH8cRB7U M7AePfPNxD8fYRd1FcpHlaJohSIwMs+JSnvVwvdM2w5VwBQ2NTCe9ClTYSVpG6nbD1St VQGa4++E5DrFxDsZzyqTd5OISu70krua0I5UFAFCq6LG5q0LzxrtwCS2VS95cTrE5cc5 xM8vVpIlIqNNvdiJU8FF1bh4czAEtGpPDZSLK36clTxeVOxm5PmV5bjyIj1zYK05C0A7 ra6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=X6P4Ic/jVR/ehQk8xDi+AsQIzeIiWoSBPu1D03k6dX4=; fh=eGaQ94Z3GIw0nN1rRdpy5oMpBBwPOESDWiN3JE4/1MY=; b=MltffTT+h8QLIFSUAsw1IoJG2P+mj4VaC7e11UPKnfjSoLRbDiCP0m5u7WCHQvamle KYKrWAFC5tXlXV3Qt87+mPm6goKTiud8RjwSJHGQ/2ZdsKoyBn/TB7WfHMY7+uqo1DJe y8iYC3MhWzG0MrlNdfFTj7CvjFIUfY70K9QHPyJc9yRE6mye4Md2/G0l1dqX3G63ZJDU cvlUnac1XoueElcmpuYQ9dOB/o9ues5Jmin2UER8I9XaG0Ch12RdNJu1xZNPqXc1Dfe1 6S4rLpiC86KEiK3W+OilldEtK3okbs2ZI1l5BZwIzBUvaI4ZBvFvaGAWiU3AoxNnypHi z9vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Q5V2nzV2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id j2-20020a056a00174200b006cde2b3ccffsi2109536pfc.32.2023.11.30.13.47.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 30 Nov 2023 13:47:35 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Q5V2nzV2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 7F0E480DFA71; Thu, 30 Nov 2023 13:47:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376972AbjK3VrT (ORCPT + 99 others); Thu, 30 Nov 2023 16:47:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229645AbjK3VrQ (ORCPT ); Thu, 30 Nov 2023 16:47:16 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84AFF10D9; Thu, 30 Nov 2023 13:47:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701380837; bh=X6P4Ic/jVR/ehQk8xDi+AsQIzeIiWoSBPu1D03k6dX4=; h=Date:From:To:Cc:Subject:From; b=Q5V2nzV2FGWLDZTKfh9HcZR7cjUPtxgdMT0oR8NmHy0tRxehCeUb+jqJNBuArqwch qBj0uQnKsVEhPUJBgtdVW324wt9cgTNyPq0kNZijSdL+NpM6z/bfU/Yy31wNi/hSq/ kw74Wx0N1VRsXUflDbz0Ck5dF61bfIQHbT5WBb+hvMiE/ek0+LnWKAXeBGk7cyvLJ6 4L3nvqALHj5MVy+lB2Mfr9pYRYXqSWyUcIo7hb3olfpuSgXr8R6sxyafSJJpfuRAXc ya6bGqDciWcRwrDl7FYMjfGSVrp/n537Fk02LyDMQkRdooR0ppupFq9W3ot1Njx6ed M4gmwBF41nLag== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Sh8tD6rL4z4xkW; Fri, 1 Dec 2023 08:47:16 +1100 (AEDT) Date: Fri, 1 Dec 2023 08:47:15 +1100 From: Stephen Rothwell To: Conor Dooley Cc: Inochi Amaoto , Linux Kernel Mailing List , Linux Next Mailing List 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 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Thu, 30 Nov 2023 13:47:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784027132068930121 X-GMAIL-MSGID: 1784027132068930121 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 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 --- 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>; }; };