From patchwork Tue Aug 13 22:49:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 11092987 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C58CD1398 for ; Tue, 13 Aug 2019 22:50:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B4FCE28784 for ; Tue, 13 Aug 2019 22:50:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B2D95287B6; Tue, 13 Aug 2019 22:50:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3C9732879B for ; Tue, 13 Aug 2019 22:50:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender:Content-Type:Cc: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject: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=a7LmUMNy0QmBDCxDggOHcz+oF/ntBL0kY/xsj0luaO8=; b=NGN kqtQlZ5Pv3qIbEq9h8MZetGiqoLcytVm18p6TgvcDtvNl8sYo0pitZ/j7PDWEl3gVZzRsszFGHszH kCwHZFbUEDybFB1Llic5E3d7fEuXY1bk3QKlIEiIOyUuVjgj9pe3TBrEQnwZuZsfn4ae9rJ7m7anB CXN0rDMiGuoVOQMNBTZex5vmr6ZWC0xw7XKCTL9eHAhtigN89NmrsjBSTNARYXKVZFFOyDrCpqBxM xlTZoR/jcfBrYmeNuTHaKBMmXJsBSg5BqOjdehcSP2GQKINWTOE5z9mBxdhJvYZY3LB0NjwYT2Hlo FMSJmsDexcUJl3MGaTdyGtensVUgRWw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hxfcI-0002m0-Tt; Tue, 13 Aug 2019 22:50:10 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxfcG-0002OW-HL for linux-arm-kernel@lists.infradead.org; Tue, 13 Aug 2019 22:50:10 +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 467SbJ15qjz9sBF; Wed, 14 Aug 2019 08:50:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1565736605; bh=z8UzHeUAlWaGfTsCQDaIbFrumXsCw0qF+4m8oeFkVbs=; h=Date:From:To:Cc:Subject:From; b=ez7AmR8IXa7fZfwsYlUqNBZ63TWJtOdyy5sD4t3Bwq3fsw9liQocwP4SWhHJ39VnF GkMgcywBrlpl3Np4PL0PSj732LTQFyiS4oFjGqeaN1IU/lheS63uh1JiSejOlzRtGU ZxqIuChuWG4lFOiZnUCPnhMAdBi8CW6j7hSXCmN68Y2P43wGI1ynla6rlkzOK8kdTK Io+wQhaXC4NXVTmke5FnT8GtsLPB/2ktaCx3Rjs0Whv7FoJZgppVFl/GONgBA/k5CY mJr2ngkHEkH4Zc+qbv6Yiv8v27PZV2WWsLftDXsmKN2XX93EqDuUotfO2ZqyLdZhAM DfUOtlSE7qMqg== Date: Wed, 14 Aug 2019 08:49:49 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , ARM Subject: linux-next: build failure after merge of the arm-soc tree Message-ID: <20190814084949.70867809@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190813_155008_803199_0AB15B7E X-CRM114-Status: UNSURE ( 8.92 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux Next Mailing List , Linux Kernel Mailing List Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Date: Wed, 14 Aug 2019 08:46:39 +1000 Subject: [PATCH] arm-soc: fix up bad rebase? Signed-off-by: Stephen Rothwell --- 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"