linux-kernel - Re: linux-next: manual merge of the pm tree with the arm-soc tree

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] [day] [month] [year] [list]

Message-ID: <4444301.nE19g0hn7H@aspire.rjw.lan>
Date:   Thu, 20 Apr 2017 02:38:10 +0200
From:   "Rafael J. Wysocki" <rjw@...ysocki.net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
        ARM <linux-arm-kernel@...ts.infradead.org>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Viresh Kumar <viresh.kumar@...aro.org>,
        Maxime Ripard <maxime.ripard@...e-electrons.com>,
        Quentin Schulz <quentin.schulz@...e-electrons.com>
Subject: Re: linux-next: manual merge of the pm tree with the arm-soc tree

On Thursday, April 20, 2017 10:34:27 AM Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the pm tree got a conflict in:
> 
>   arch/arm/boot/dts/sun8i-a33.dtsi
> 
> between commits:
> 
>   66c373228dc4 ("ARM: sun8i: a33: Add the Mali OPPs")
>   e6bd37627e92 ("ARM: sun8i: a33: add all operating points")
> 
> from the arm-soc tree and commit:
> 
>   d87bd1942058 ("PM / OPP: Use - instead of @ for DT entries")
> 
> from the pm tree.

Thanks for the report!

I'm going to drop the conflicting commit tomorrow.

Thanks,
Rafael