linux-next: build failure after merge of the arm-soc tree
diff mbox series

Message ID 20190814084949.70867809@canb.auug.org.au
State New
Headers show
Series
  • linux-next: build failure after merge of the arm-soc tree
Related show

Commit Message

Stephen Rothwell Aug. 13, 2019, 10:49 p.m. UTC
Hi all,

After merging the arm-soc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

arch/arm/Kconfig:720: syntax error
arch/arm/Kconfig:719: invalid statement
arch/arm/Kconfig:720: can't open file "arch/arm/mach-ks8695/Kconfig"

Caused by commit

  eb4f78f8b8cb ("ARM: remove ks8695 platform")

I applied the following patch for today

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 14 Aug 2019 08:46:39 +1000
Subject: [PATCH] arm-soc: fix up bad rebase?

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/arm/Kconfig | 6 ------
 1 file changed, 6 deletions(-)

Comments

Arnd Bergmann Aug. 14, 2019, 10:52 a.m. UTC | #1
On Wed, Aug 14, 2019 at 12:50 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> After merging the arm-soc tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> arch/arm/Kconfig:720: syntax error
> arch/arm/Kconfig:719: invalid statement
> arch/arm/Kconfig:720: can't open file "arch/arm/mach-ks8695/Kconfig"
>
> Caused by commit
>
>   eb4f78f8b8cb ("ARM: remove ks8695 platform")
>
> I applied the following patch for today
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 14 Aug 2019 08:46:39 +1000
> Subject: [PATCH] arm-soc: fix up bad rebase?
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>


Thanks for the report. I folded your fix into the original patch now.

       Arnd

Patch
diff mbox series

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1597c542dc4f..769a853c8c6e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -716,12 +716,6 @@  source "arch/arm/mach-ixp4xx/Kconfig"
 
 source "arch/arm/mach-keystone/Kconfig"
 
-<<<<<<< HEAD
-source "arch/arm/mach-ks8695/Kconfig"
-=======
-source "arch/arm/mach-lpc32xx/Kconfig"
->>>>>>> ARM: remove ks8695 platform
-
 source "arch/arm/mach-mediatek/Kconfig"
 
 source "arch/arm/mach-meson/Kconfig"