From patchwork Mon Aug 1 23:24:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9254945 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3B0186077C for ; Mon, 1 Aug 2016 23:27:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29651284D5 for ; Mon, 1 Aug 2016 23:27:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D490284DD; Mon, 1 Aug 2016 23:27:14 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BC2E5284D5 for ; Mon, 1 Aug 2016 23:27:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bUMaF-00081p-1Q; Mon, 01 Aug 2016 23:25:19 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bUMaB-0006pu-DQ for linux-arm-kernel@lists.infradead.org; Mon, 01 Aug 2016 23:25:16 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3s3FmL6Zj5z9s4n; Tue, 2 Aug 2016 09:24:50 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1470093891; bh=p0mjOjpfJvCf7kn5DeXNx3dZgp2XPgm/MGUhHR5estM=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=BnL3mFglcZBUg4qUVGmDeWuh6w7ssVVnsyjw+mnZKaF16RiqH6tlWEoLLBfqYnJQk MpmSAolSkaFqojSHIhWQFlySnnmMs9n6vv5re5UZ3KQoM69vXD1jR7oFMx4SxfRUfE TzvE6dUGZGJPqa0Musv1JHp+R0VKu3EfzxoCQQbA= Date: Tue, 2 Aug 2016 09:24:50 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , Subject: Re: linux-next: manual merge of the clockevents tree with the arm-soc tree Message-ID: <20160802092450.36780125@canb.auug.org.au> In-Reply-To: <20160727080845.12b58ebe@canb.auug.org.au> References: <20160707141226.2b9c1e15@canb.auug.org.au> <20160727080845.12b58ebe@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160801_162515_865022_60CCBAA1 X-CRM114-Status: GOOD ( 20.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Lezcano , Linus , linux-next@vger.kernel.org, Alexander Shiyan , linux-kernel@vger.kernel.org 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, On Wed, 27 Jul 2016 08:08:45 +1000 Stephen Rothwell wrote: > > On Thu, 7 Jul 2016 14:12:26 +1000 Stephen Rothwell wrote: > > > > Today's linux-next merge of the clockevents tree got a conflict in: > > > > arch/arm/Kconfig > > > > between commit: > > > > c86f51737f8d ("ARM: clps711x: Switch to MULTIPLATFORM") > > > > from the arm-soc tree and commit: > > > > 250e46aa3bb3 ("clocksource/drivers/clps_711x: Add the COMPILE_TEST option") > > > > from the clockevents tree. > > > > I fixed it up (I used the arm-soc version of this file and then added > > the following merge fix patch) and can carry the fix as necessary. This > > is now fixed as far as linux-next is concerned, but any non trivial > > conflicts should be mentioned to your upstream maintainer when your tree > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. > > > > From: Stephen Rothwell > > Date: Thu, 7 Jul 2016 13:59:06 +1000 > > Subject: [PATCH] clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM" > > > > Signed-off-by: Stephen Rothwell > > --- > > arch/arm/mach-clps711x/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig > > index 3b56197ccfd0..dc7c6edeab39 100644 > > --- a/arch/arm/mach-clps711x/Kconfig > > +++ b/arch/arm/mach-clps711x/Kconfig > > @@ -3,8 +3,8 @@ menuconfig ARCH_CLPS711X > > depends on ARCH_MULTI_V4T > > select ARCH_REQUIRE_GPIOLIB > > select AUTO_ZRELADDR > > - select CLKSRC_MMIO > > select CLKSRC_OF > > + select CLPS711X_TIMER > > select COMMON_CLK > > select CPU_ARM720T > > select GENERIC_CLOCKEVENTS > > -- > > 2.8.1 > > Since Linus has merged most of the tip tree now, this merge fixup is > required when (part of) the arm-soc tree is moerged with Linus' tree. This merge fix patch was missed when Linus merged the various bits of the arm-soc tree overnight. :-( Here is the merge fix patch again: From: Stephen Rothwell Date: Thu, 7 Jul 2016 13:59:06 +1000 Subject: [PATCH] clocksource/drivers/clps_711x: fixup for "ARM: clps711x: Switch to MULTIPLATFORM" Signed-off-by: Stephen Rothwell --- arch/arm/mach-clps711x/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig index 3b56197ccfd0..dc7c6edeab39 100644 --- a/arch/arm/mach-clps711x/Kconfig +++ b/arch/arm/mach-clps711x/Kconfig @@ -3,8 +3,8 @@ menuconfig ARCH_CLPS711X depends on ARCH_MULTI_V4T select ARCH_REQUIRE_GPIOLIB select AUTO_ZRELADDR - select CLKSRC_MMIO select CLKSRC_OF + select CLPS711X_TIMER select COMMON_CLK select CPU_ARM720T select GENERIC_CLOCKEVENTS