From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: linux-next: build failure after merge of the arm-soc tree
Date: Wed, 14 Aug 2019 08:49:49 +1000 [thread overview]
Message-ID: <20190814084949.70867809@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1162 bytes --]
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(-)
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"
--
2.20.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-08-13 22:50 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-13 22:49 Stephen Rothwell [this message]
2019-08-14 10:52 ` linux-next: build failure after merge of the arm-soc tree Arnd Bergmann
-- strict thread matches above, loose matches on Subject: below --
2023-07-24 23:50 Stephen Rothwell
2023-06-13 0:43 Stephen Rothwell
2023-06-13 6:38 ` Linus Walleij
2023-01-16 5:27 Stephen Rothwell
2023-01-16 10:16 ` Arnd Bergmann
2022-03-01 22:50 Stephen Rothwell
2022-03-02 7:45 ` Arnd Bergmann
2022-03-02 9:52 ` Matthias Brugger
2022-03-03 17:23 ` Arnd Bergmann
2021-10-12 0:03 Stephen Rothwell
2021-10-12 7:35 ` Nicolas Ferre
2021-10-12 7:56 ` Arnd Bergmann
2021-10-12 9:29 ` Nicolas Ferre
2021-04-09 10:13 Stephen Rothwell
2021-04-09 10:56 ` Hector Martin
2020-11-23 22:31 Stephen Rothwell
2020-11-24 9:18 ` Christoph Hellwig
2020-11-24 10:43 ` Maxime Ripard
2018-07-15 23:13 Stephen Rothwell
2018-07-15 23:50 ` Olof Johansson
2018-07-16 0:38 ` Olof Johansson
2018-07-16 6:18 ` Robert Jarzmik
2016-04-25 23:43 Stephen Rothwell
2016-04-25 23:54 ` Arnd Bergmann
2016-04-26 0:51 ` Stephen Rothwell
2016-04-26 7:40 ` Arnd Bergmann
2015-12-17 6:40 Stephen Rothwell
2015-10-14 23:19 Stephen Rothwell
2015-10-15 2:40 ` Jisheng Zhang
2015-10-15 15:52 ` Arnd Bergmann
2015-10-15 14:10 ` Arnd Bergmann
2015-08-07 0:33 Stephen Rothwell
2015-06-12 0:30 Michael Ellerman
2015-06-12 18:19 ` Kevin Hilman
2015-04-07 1:12 Stephen Rothwell
2015-04-07 8:43 ` Matthias Brugger
2015-04-07 9:28 ` Linus Walleij
2015-04-07 9:46 ` Matthias Brugger
2015-04-07 12:28 ` Arnd Bergmann
2015-04-08 14:49 ` Linus Walleij
2015-04-08 14:59 ` Matthias Brugger
2015-04-13 23:47 ` Stephen Rothwell
2015-04-14 0:05 ` Arnd Bergmann
2014-10-02 1:37 Stephen Rothwell
2014-10-02 2:36 ` Kukjin Kim
2014-10-02 14:32 ` Arnd Bergmann
2014-10-03 6:50 ` Javier Martinez Canillas
2014-10-03 7:56 ` Russell King - ARM Linux
2014-10-03 8:07 ` Javier Martinez Canillas
2014-09-26 1:55 Stephen Rothwell
2014-09-26 2:57 ` Wei Xu
2014-09-30 0:12 ` Stephen Rothwell
2014-09-30 1:45 ` Wei Xu
2014-03-09 11:55 Mark Brown
2014-03-10 10:45 ` Will Deacon
2014-03-10 11:58 ` Catalin Marinas
2014-03-09 11:41 Mark Brown
2014-03-09 17:08 ` Olof Johansson
2014-03-09 19:08 ` Mark Brown
2013-04-19 6:46 Stephen Rothwell
2013-04-19 14:01 ` Olof Johansson
2013-04-22 13:26 ` Thomas Petazzoni
2011-10-04 0:26 Stephen Rothwell
2011-10-04 7:40 ` Arnd Bergmann
2011-10-04 9:39 ` Nicolas Ferre
2011-10-06 0:13 ` Stephen Rothwell
2011-10-07 9:09 ` Nicolas Ferre
2011-10-07 15:41 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190814084949.70867809@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).