linux-kernel - linux-next: build failure after merge of the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20211012110309.17d51c3e@canb.auug.org.au>
Date:   Tue, 12 Oct 2021 11:03:09 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: linux-next: build failure after merge of the arm-soc tree

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 <sfr@...b.auug.org.au>
Date: Tue, 12 Oct 2021 10:37:29 +1100
Subject: [PATCH] merge fix for missing semicolon

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
 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@...1d180 {
 		chipid@...20000 {
 			compatible = "microchip,sama7g5-chipid";
 			reg = <0xe0020000 0x8>;
-		}
+		};
 
 		adc: adc@...00000 {
 			compatible = "microchip,sama7g5-adc";
-- 
2.33.0

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped