linux-kernel - Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.12-1 tag

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: <87h7m3twle.fsf@mpe.ellerman.id.au>
Date:   Tue, 23 Feb 2021 12:13:33 +1100
From:   Michael Ellerman <mpe@...erman.id.au>
To:     Rob Herring <robh@...nel.org>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Alexey Kardashevskiy <aik@...abs.ru>, ananth@...ux.ibm.com,
        "Aneesh Kumar K.V" <aneesh.kumar@...ux.ibm.com>,
        atrajeev@...ux.vnet.ibm.com, Qian Cai <cai@....pw>,
        christophe.leroy@...roup.eu,
        Cédric Le Goater <clg@...d.org>,
        cmr@...efail.de, cy.fan@...wei.com, eerykitty@...il.com,
        SF Markus Elfring <elfring@...rs.sourceforge.net>,
        Florian Fainelli <f.fainelli@...il.com>, fbarrat@...ux.ibm.com,
        ganeshgr@...ux.ibm.com, Haren Myneni <haren@...ux.ibm.com>,
        Hari Bathini <hbathini@...ux.ibm.com>,
        jiapeng.chong@...ux.alibaba.com, kernelfans@...il.com,
        kjain@...ux.ibm.com,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        linuxppc-dev <linuxppc-dev@...ts.ozlabs.org>,
        Michal Suchanek <msuchanek@...e.de>, nathanl@...ux.ibm.com,
        Nicholas Piggin <npiggin@...il.com>,
        Oliver O'Halloran <oohall@...il.com>, po-hsu.lin@...onical.com,
        Randy Dunlap <rdunlap@...radead.org>, sandipan@...ux.ibm.com,
        skirmisher@...tonmail.com,
        Bhaskar Chowdhury <unixbhaskar@...il.com>,
        zhengyongjun3@...wei.com, Mark Brown <broonie@...nel.org>
Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.12-1 tag

Rob Herring <robh@...nel.org> writes:
> On Mon, Feb 22, 2021 at 6:05 AM Michael Ellerman <mpe@...erman.id.au> wrote:
>>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA256
>>
>> Hi Linus,
>>
>> Please pull powerpc updates for 5.12.
>>
>> There will be a conflict with the devicetree tree. It's OK to just take their
>> side of the conflict, we'll fix up the minor behaviour change that causes in a
>> follow-up patch.
>
> The issues turned out to be worse than just this, so I've dropped the
> conflicting change for 5.12.

OK, no worries.

cheers