From patchwork Mon Aug 23 23:49:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12453745 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E51D5C4338F for ; Mon, 23 Aug 2021 23:51:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B004D61378 for ; Mon, 23 Aug 2021 23:51:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B004D61378 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=0xKA05xknDRnx6PlPQEN0CWHdxRipPDrERDKzt4fZbM=; b=K9B Ii2vszb2fRvHFk4a3st4mc4DAbUtbozkaPfvZnX8rYpcnXawTBYZakyTG1R0nkL6Kl0zXP8f/HYqf I/6dg1piEotqXR1aoW4ldEBKicwYAk66xErcFB5HBaRXTcZV+CkSDqYAJZCEubTyWejc9JUjHbyFT 7M/q+mAlJ8zTE+5C5oYAfPrE1PmmtjNC3D/8KW3OGY8PYHUgTNLBBvtHg8xlutw9M9X55pZ67LDW7 1QpOebjOa+IX75YLQTOgEdi8djf2P2ymElOkKTo4M7P0XeTk6ueZI9eAjEqYQyu162G3DwpegqrCa efPfog3E+i9j+HrKIFRc7/djkyu8hVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIJgp-0010YS-Oj; Mon, 23 Aug 2021 23:49:15 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mIJgi-0010Wa-HD for linux-arm-kernel@lists.infradead.org; Mon, 23 Aug 2021 23:49:12 +0000 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4GtpqL1QmBz9sXV; Tue, 24 Aug 2021 09:49:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1629762543; bh=TrsJgQa9hwO4ggw8pgCHQBL4dYbbuKchT5MLHj8hJIU=; h=Date:From:To:Cc:Subject:From; b=jYzj6tmI9OZ4+0JgutoBvOFSqG7S1JmI/VJQW6oLB+Cd5qH5tDIKLg4NUGK4XtVBl qRf+k/8SukRvery57QIRkQf0SOsht6YdpA8EDkuCozZBiJ1iznPGkrDAlkOhBc4BUe qPjmRGXFxd7BB3DzUHazLUS5R1HgH26H0kr5MlsRqbNtvKDEC58qzOLoFZgSq3J2ae xjEZiwRWZ1XsLeqLQQBlNxpaOHPHOZBpeOaLQ0rScRwOG/FSyRWxYa0tNrROSeQytV /4BMzsnu4/abF74nNPXf860flruC6nKPDGkUabiXLNFto0YHvkVqxXXL3+qZkHi8Fo 6OEblMnBneP6w== Date: Tue, 24 Aug 2021 09:49:01 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM Cc: Gregory CLEMENT , Konstantin Porotchkin , Linux Kernel Mailing List , Linux Next Mailing List , Rob Herring Subject: linux-next: manual merge of the arm-soc tree with the arm-soc-fixes tree Message-ID: <20210824094901.57a3ab0c@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210823_164908_837468_F898FEEE X-CRM114-Status: GOOD ( 21.76 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 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 --- 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>; };