lkml.org 
[lkml]   [2021]   [Oct]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjectlinux-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@canb.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@canb.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@e001d180 {
chipid@e0020000 {
compatible = "microchip,sama7g5-chipid";
reg = <0xe0020000 0x8>;
- }
+ };

adc: adc@e1000000 {
compatible = "microchip,sama7g5-adc";
--
2.33.0
--
Cheers,
Stephen Rothwell
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2021-10-12 02:05    [W:0.050 / U:0.460 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site