From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753756AbcHVA2S (ORCPT ); Sun, 21 Aug 2016 20:28:18 -0400 Received: from ozlabs.org ([103.22.144.67]:42266 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753164AbcHVA2R (ORCPT ); Sun, 21 Aug 2016 20:28:17 -0400 Date: Mon, 22 Aug 2016 10:28:13 +1000 From: Stephen Rothwell To: Krzysztof Kozlowski , Shawn Guo Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tuomas Tynkkynen , Javier Martinez Canillas Subject: linux-next: manual merge of the samsung-krzk tree with the imx-mxs tree Message-ID: <20160822102813.4ffe9a4b@canb.auug.org.au> 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 all, Today's linux-next merge of the samsung-krzk tree got a conflict in: arch/arm/configs/multi_v7_defconfig between commit: 409a05fe10be ("ARM: multi_v7_defconfig: Enable ARM_IMX6Q_CPUFREQ") from the imx-mxs tree and commit: 08023fb9cec0 ("ARM: multi_v7_defconfig: Don't attempt to enable schedutil governor as module") from the samsung-krzk tree. I fixed it up (see below) 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. -- Cheers, Stephen Rothwell diff --cc arch/arm/configs/multi_v7_defconfig index 7db8dce3da5f,6a055443f51b..000000000000 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@@ -135,8 -136,7 +136,8 @@@ CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND= CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=m CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m - CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m + CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y +CONFIG_ARM_IMX6Q_CPUFREQ=y CONFIG_QORIQ_CPUFREQ=y CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y