From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753012AbbKWBWx (ORCPT ); Sun, 22 Nov 2015 20:22:53 -0500 Received: from ozlabs.org ([103.22.144.67]:47918 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752813AbbKWBWw (ORCPT ); Sun, 22 Nov 2015 20:22:52 -0500 Date: Mon, 23 Nov 2015 12:22:47 +1100 From: Stephen Rothwell To: Daniel Lezcano , Krzysztof Kozlowski Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Alim Akhtar Subject: linux-next: manual merge of the clockevents tree with the samsung-krzk tree Message-ID: <20151123122247.23eb6f3d@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Daniel, Today's linux-next merge of the clockevents tree got a conflict in: arch/arm/mach-exynos/Kconfig between commit: 23067d397616 ("ARM: EXYNOS: Switch to syscon reboot and poweroff") from the samsung-krzk tree and commit: b21f38ccbc1d ("clocksource/drivers/exynos_mct: Fix Kconfig and add COMPILE_TEST option") from the clockevents tree. OK, so these entries were sorted at one point for a reason :-( I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc arch/arm/mach-exynos/Kconfig index d279edf9b10d,ff105399aae4..000000000000 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@@ -14,6 -14,6 +14,7 @@@ menuconfig ARCH_EXYNO select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select ARM_GIC ++ select CLKSRC_EXYNOS_MCT select COMMON_CLK_SAMSUNG select EXYNOS_THERMAL select HAVE_ARM_SCU if SMP @@@ -23,13 -23,11 +24,13 @@@ select PINCTRL select PINCTRL_EXYNOS select PM_GENERIC_DOMAINS if PM ++ select POWER_RESET ++ select POWER_RESET_SYSCON ++ select POWER_RESET_SYSCON_POWEROFF select S5P_DEV_MFC select SRAM select THERMAL select MFD_SYSCON - select POWER_RESET - select POWER_RESET_SYSCON - select POWER_RESET_SYSCON_POWEROFF - select CLKSRC_EXYNOS_MCT help Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)