linux-kernel - Re: [GIT PULL 4/4] ARM: defconfig: Exynos for v4.9

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20160902163025.GA5534@kozik-lap>
Date:   Fri, 2 Sep 2016 18:30:25 +0200
From:   Krzysztof Kozlowski <krzk@...nel.org>
To:     Arnd Bergmann <arnd@...db.de>
Cc:     Krzysztof Kozlowski <k.kozlowski@...sung.com>,
        Olof Johansson <olof@...om.net>,
        Kevin Hilman <khilman@...nel.org>, arm@...nel.org,
        Kukjin Kim <kgene@...nel.org>,
        linux-arm-kernel@...ts.infradead.org,
        linux-samsung-soc@...r.kernel.org, linux-kernel@...r.kernel.org,
        Bartlomiej Zolnierkiewicz <b.zolnierkie@...sung.com>,
        Krzysztof Kozlowski <krzk@...nel.org>
Subject: Re: [GIT PULL 4/4] ARM: defconfig: Exynos for v4.9

On Fri, Sep 02, 2016 at 05:47:11PM +0200, Arnd Bergmann wrote:
> 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?

The conflict is between my tree and imx-mxs tree so you might encounter
it later when merging IMX changes.

Best regards,
Krzysztof