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 [thread overview]
Message-ID: <4575445.BeuOIIGatt@wuerfel> (raw)
In-Reply-To: <1472548739-20050-2-git-send-email-k.kozlowski@samsung.com>
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
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL 4/4] ARM: defconfig: Exynos for v4.9
Date: Fri, 02 Sep 2016 17:47:11 +0200 [thread overview]
Message-ID: <4575445.BeuOIIGatt@wuerfel> (raw)
In-Reply-To: <1472548739-20050-2-git-send-email-k.kozlowski@samsung.com>
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
next prev parent reply other threads:[~2016-09-02 15:47 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-30 9:18 [GIT PULL 0/4] ARM: exynos: Stuff for v4.9 Krzysztof Kozlowski
2016-08-30 9:18 ` Krzysztof Kozlowski
2016-08-30 9:18 ` [GIT PULL 4/4] ARM: defconfig: Exynos " Krzysztof Kozlowski
2016-08-30 9:18 ` Krzysztof Kozlowski
2016-09-02 15:47 ` Arnd Bergmann [this message]
2016-09-02 15:47 ` Arnd Bergmann
2016-09-02 16:30 ` Krzysztof Kozlowski
2016-09-02 16:30 ` Krzysztof Kozlowski
2016-08-30 9:18 ` [GIT PULL 2/4] ARM: dts: exynos: DeviceTree " Krzysztof Kozlowski
2016-08-30 9:18 ` Krzysztof Kozlowski
2016-09-13 14:11 ` Arnd Bergmann
2016-09-13 14:11 ` Arnd Bergmann
2016-08-30 9:18 ` [GIT PULL 3/4] arm64: dts: exynos: DeviceTree ARM64 " Krzysztof Kozlowski
2016-08-30 9:18 ` Krzysztof Kozlowski
2016-09-14 14:52 ` Arnd Bergmann
2016-09-14 14:52 ` Arnd Bergmann
2016-08-30 9:18 ` [GIT PULL 1/4] ARM: exynos: SoC/Mach " Krzysztof Kozlowski
2016-08-30 9:18 ` Krzysztof Kozlowski
2016-09-02 16:26 ` Arnd Bergmann
2016-09-02 16:26 ` Arnd Bergmann
2016-09-02 16:32 ` Krzysztof Kozlowski
2016-09-02 16:32 ` Krzysztof Kozlowski
2016-09-05 8:06 ` Sylwester Nawrocki
2016-09-05 8:06 ` Sylwester Nawrocki
2016-09-08 19:24 ` Sam Van Den Berge
2016-09-08 19:24 ` Sam Van Den Berge
2016-09-12 9:38 ` Sylwester Nawrocki
2016-09-12 9:38 ` Sylwester Nawrocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4575445.BeuOIIGatt@wuerfel \
--to=arnd@arndb.de \
--cc=arm@kernel.org \
--cc=b.zolnierkie@samsung.com \
--cc=k.kozlowski@samsung.com \
--cc=kgene@kernel.org \
--cc=khilman@kernel.org \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.