From patchwork Tue Oct 12 00:03:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 12551159 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9CA9C433EF for ; Tue, 12 Oct 2021 00:06:11 +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 9D31660F11 for ; Tue, 12 Oct 2021 00:06:11 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 9D31660F11 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=C776Y7rN+DY/ogfP9Ax2yNX06Abpl9PwlhJNQhA1s4Q=; b=1HO nb5R1zmXnK64EJ4zRD7N4gFWXm6bdyXvECWIgwKy7RDjEfQeDIZxK4hHJ2QPnF+u39tCsZ0Byj6VS W5XkUVbzn6BWNGilYPzwnNimXkJpqzpMGF/r93O0BbwvKHkyPaJfz/ziuhB4DFDgwS2LEdAWKmPT9 gtd/JSm/OhjraB/BE3m7EzoINLv2ZUXDW/Vwd48+22PjS2jdSbenwKE1sF0ZbDafIJV6XfCJgnXQP U6pgMm/BKU9cjEya5q+zo373emDTz7mqt3Sk9eIx65fAW6lMdwZpS+2Rlez4CA9CqC8rgGOJDb7mp qsCVVR+8h3x23K1JLt/C2udN7KY8/cQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ma5Gh-00B2jK-5f; Tue, 12 Oct 2021 00:03:43 +0000 Received: from gandalf.ozlabs.org ([2404:9400:2:0:216:3eff:fee2:21ea]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ma5GH-00B2im-RR for linux-arm-kernel@lists.infradead.org; Tue, 12 Oct 2021 00:03:19 +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 4HSwq40LFtz4xqP; Tue, 12 Oct 2021 11:03:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1633996992; bh=gB89dn2qCWOpeT87X7TCgqp2JJ6phnH05D+Cb2xpK3A=; h=Date:From:To:Cc:Subject:From; b=bX+QI5lNCmRzbB4opLVZQB8ZPRzeFugVp/QvdyFki/wk05SS5ZFwucvdcvf8jpzVB Uwo8LF+wVw3Xjg1a8SxEYBs5TNf2L/VK4cB92bq1E0X1dPqkPbUJY2tl+h4mTkBsPp Bw/DDVm2asRNZqP8UeIpZVOF8BhLV2uMYPWOlYv4VYTTu9h8jyZOM9zsBTYibfMeYt WmxIyfOmpRFbHv6zLTr/IU0wY559bDNnPwaPBOBXoG03uajmjgDwMloic42LGAekRF XFHI7XiI49via2Wr+kwn0hRcH27fZ+jom0Opy5Z9uAPOB9q+9ZiYIiCnnmXI4Ryi5x P81KUFYnlRuRQ== Date: Tue, 12 Oct 2021 11:03:09 +1100 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the arm-soc tree Message-ID: <20211012110309.17d51c3e@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211011_170318_073091_4D3B7281 X-CRM114-Status: GOOD ( 15.48 ) 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, After merging the arm-soc tree, today's linux-next build (arm multi_v7_defconfig) failed like this: Error: arch/arm/boot/dts/sama7g5.dtsi:167.3-7 syntax error FATAL ERROR: Unable to parse input tree Caused by commit 9be4be3ed1ec ("Merge branch 'arm/dt' into for-next") I added the following patch for today: From: Stephen Rothwell Date: Tue, 12 Oct 2021 10:37:29 +1100 Subject: [PATCH] merge fix for missing semicolon Signed-off-by: Stephen Rothwell --- arch/arm/boot/dts/sama7g5.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/sama7g5.dtsi b/arch/arm/boot/dts/sama7g5.dtsi index efcaa6ad7533..f98977f3980d 100644 --- a/arch/arm/boot/dts/sama7g5.dtsi +++ b/arch/arm/boot/dts/sama7g5.dtsi @@ -162,7 +162,7 @@ ps_wdt: watchdog@e001d180 { chipid@e0020000 { compatible = "microchip,sama7g5-chipid"; reg = <0xe0020000 0x8>; - } + }; adc: adc@e1000000 { compatible = "microchip,sama7g5-adc";