From patchwork Mon Mar 3 01:02:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 3750491 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EA7359F376 for ; Mon, 3 Mar 2014 01:03:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1AFAF20374 for ; Mon, 3 Mar 2014 01:03:36 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2432A202EC for ; Mon, 3 Mar 2014 01:03:35 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKHI0-0007eQ-Ks; Mon, 03 Mar 2014 01:03:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKHHy-00081M-84; Mon, 03 Mar 2014 01:03:26 +0000 Received: from ozlabs.org ([2402:b800:7003:1:1::1]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WKHHt-00080N-PJ for linux-arm-kernel@lists.infradead.org; Mon, 03 Mar 2014 01:03:23 +0000 Received: from canb.auug.org.au (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id D7C9F2C00C2; Mon, 3 Mar 2014 12:02:48 +1100 (EST) Date: Mon, 3 Mar 2014 12:02:41 +1100 From: Stephen Rothwell To: Stephen Warren , Olof Johansson , Arnd Bergmann , Subject: linux-next: manual merge of the bcm2835 tree with the arm-soc tree Message-Id: <20140303120241.11066f951d53c50fb14faf47@canb.auug.org.au> X-Mailer: Sylpheed 3.4.0beta7 (GTK+ 2.24.22; i486-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140302_200322_273471_2584891A X-CRM114-Status: GOOD ( 20.25 ) X-Spam-Score: -1.9 (-) Cc: Markus Mayer , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Rob Herring X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Stephen, Today's linux-next merge of the bcm2835 tree got a conflict in arch/arm/mach-bcm2835/Kconfig between commits ddb902cc3459 ("ARM: centralize common multi-platform kconfig options") and 0676b21fffd1 ("ARM: bcm2835: enable V6K instead of plain V6") from the arm-soc tree and commit d30fe6272183 ("ARM: bcm2835: Move to mach-bcm directory") from the bcm2835 tree. I fixed it up (I applied the below merge fix patch) and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Mon, 3 Mar 2014 12:00:40 +1100 Subject: [PATCH] ARM: bcm2835: merge fix for movement to mach-bcm directory Signed-off-by: Stephen Rothwell --- arch/arm/mach-bcm/Kconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 396d05c8b570..7de3282a8613 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -33,10 +33,6 @@ config ARCH_BCM2835 select ARM_AMBA select ARM_ERRATA_411920 select ARM_TIMER_SP804 - select CLKDEV_LOOKUP - select CLKSRC_OF - select CPU_V6 - select GENERIC_CLOCKEVENTS select PINCTRL select PINCTRL_BCM2835 help