From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S932401AbcIBPra (ORCPT <rfc822;w@1wt.eu>);
        Fri, 2 Sep 2016 11:47:30 -0400
Received: from mout.kundenserver.de ([212.227.126.133]:56794 "EHLO
        mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S932236AbcIBPr2 (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Fri, 2 Sep 2016 11:47:28 -0400
From: Arnd Bergmann <arnd@arndb.de>
To: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Cc: Olof Johansson <olof@lixom.net>, Kevin Hilman <khilman@kernel.org>,
        arm@kernel.org, Kukjin Kim <kgene@kernel.org>,
        linux-arm-kernel@lists.infradead.org,
        linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>,
        Krzysztof Kozlowski <krzk@kernel.org>
Subject: Re: [GIT PULL 4/4] ARM: defconfig: Exynos for v4.9
Date: Fri, 02 Sep 2016 17:47:11 +0200
Message-ID: <4575445.BeuOIIGatt@wuerfel>
User-Agent: KMail/5.1.3 (Linux/4.4.0-34-generic; KDE/5.18.0; x86_64; ; )
In-Reply-To: <1472548739-20050-2-git-send-email-k.kozlowski@samsung.com>
References: <1472548739-20050-1-git-send-email-k.kozlowski@samsung.com> <1472548739-20050-2-git-send-email-k.kozlowski@samsung.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:Yn+UWwZPMfkTuADNUOlzTsmNjEtDasQAIPcdGRaR8tjSAy+8YF3
 q1LpmN0L3Q4es0b0197DObK2J5yC3i5g861I5GYRm0js/yjk/uaogB91O5zprTdSma/nif4
 y0DQEs1lGIFJbjh7sgVzCyrnOVvj4elq8Tor3PSm6j/bzou8ngmrSOj0zXP2chEbqsdogT9
 N/zOyunNnRrO+e1eeylGA==
X-UI-Out-Filterresults: notjunk:1;V01:K0:VP/FE1IIQvo=:I4cvH5aLx/wPUoWNdLsrCf
 YBkXGyI/wSFJB6Ba2LwdZf+m9X8qOPP1vrqoZF/aSEq2DELCFr0y/PA9KUqWa1VeKWXxSVw8E
 4uNYgR8EVrfx/s+20h02MqxB1L4esWcEsjJ2zj/jX4IR2xx95WDHVOuYLi/C0PgG3JTXcx30l
 u33cKXz7fTVf0APOEKTdxJ1y64kDjWt9v8pWTsokLewJXfrRDqUPushrg4YjFAi7HpIH6rNQU
 F12nn5msl9ydSZYPWot5KQBOHURRY4CdSdQ6D1wqsNYHFVVujm1MXYqBuLZENTSCOlG9ovJyl
 Rru0vSNevDyLXpsWDb0N6z6bbk7HaONNWq1oax9nWhreHcHI/xtx8AonDHSo2qZBTK963zyST
 02ULfuJ148YqIM4lid/ntYS3uA4E0IVTbvnxg+DcTHLXaA6sbwyMRimCkApqCqCqZOPyD6W4p
 1yzSPAwZa0m2VaV32iO1HabKRH7kJQxG2ZBeADerqmtVyucu6+L+gr1Um/233VDrvcWJ+5lLS
 Om1y7sQ1ZX4aJgMLdKmJiGlZnsab8MG4fg8yaNqvwRBohLhTD/+SuppslFvjJCARCpkUXT4JT
 vj7Zvaqdp/9Y2XyAkr+YQcvKpEFoC0Zqg0zZtZTgs4yT+2lBiIUodW/5RPg6OGc4VcCZhNDzv
 JJcsM4iM4q/fH24w7XNYMamsU5hSW/hXRj78LyMhytKfvscRPAJSBb04o3nEbub1NZS+Ht/AP
 9Zcwfu6av34pTDns
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tuesday, August 30, 2016 11:18:56 AM CEST Krzysztof Kozlowski wrote:
> Expected conflict in multi_v7 - take all the changes:
> 
> --- 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
> 
> 

I pulled this into next/defconfig, but didn't see the conflict,
presumably I'll get it after merging the other branches?

	Arnd