linux-kernel - Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.10-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] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHk-=wjTwLKR1YhVHv5UzvCag5jxBeKVxLLxN9-CoxQYhi_=Kw@mail.gmail.com>
Date:   Fri, 16 Oct 2020 12:22:23 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Michael Ellerman <mpe@...erman.id.au>
Cc:     ajd@...ux.ibm.com, "Aneesh Kumar K.V" <aneesh.kumar@...ux.ibm.com>,
        atrajeev@...ux.vnet.ibm.com, bauerman@...ux.ibm.com,
        biwen.li@....com, Qian Cai <cai@....pw>, cheloha@...ux.ibm.com,
        Christophe Leroy <christophe.leroy@...roup.eu>, clg@...d.org,
        Colin King <colin.king@...onical.com>,
        David Miller <davem@...emloft.net>,
        Daniel Axtens <dja@...ens.net>, ego@...ux.vnet.ibm.com,
        fbarrat@...ux.ibm.com, fthain@...egraphics.com.au,
        gromero@...ux.ibm.com, Christoph Hellwig <hch@....de>,
        hofrat@...dl.org, jniethe5@...il.com,
        Joel Stanley <joel@....id.au>, kjain@...ux.ibm.com,
        leobras.c@...il.com, Li Yang <leoyang.li@....com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        linuxppc-dev <linuxppc-dev@...ts.ozlabs.org>,
        liushixin2@...wei.com, mahesh@...ux.ibm.com,
        miaoqinglang@...wei.com, mrochs@...ux.ibm.com,
        nathanl@...ux.ibm.com,
        "Naveen N. Rao" <naveen.n.rao@...ux.vnet.ibm.com>,
        Nick Piggin <npiggin@...il.com>,
        "Oliver O'Halloran" <oohall@...il.com>,
        Paul Mackerras <paulus@...abs.org>,
        Peter Zijlstra <peterz@...radead.org>,
        Ravi Bangoria <ravi.bangoria@...ux.ibm.com>,
        Russell Currey <ruscur@...sell.cc>,
        Stephen Rothwell <sfr@...b.auug.org.au>,
        Srikar Dronamraju <srikar@...ux.vnet.ibm.com>,
        Stephen Kitt <steve@....org>,
        Vaibhav Jain <vaibhav@...ux.ibm.com>, wangwensheng4@...wei.com,
        Wolfram Sang <wsa@...nel.org>, yanaijie@...wei.com,
        yangyingliang@...wei.com, zhengbin <zhengbin13@...wei.com>
Subject: Re: [GIT PULL] Please pull powerpc/linux.git powerpc-5.10-1 tag

On Thu, Oct 15, 2020 at 8:24 PM Michael Ellerman <mpe@...erman.id.au> wrote:
>
> Just two minor conflicts I'm aware of. The only slight subtlety is the conflict
> in kasan_init() where "int ret" needs to move out of the for_each_mem_range()
> and up to the function scope.

Well, there was also a conflict for the dependencies of OCXL.

I resolved that by ruthlessly simplifying the dependency:

-       depends on PPC_POWERNV && PCI && EEH && HOTPLUG_PCI_POWERNV
 -      depends on PPC_POWERNV && PCI && EEH && PPC_XIVE_NATIVE
++      depends on HOTPLUG_PCI_POWERNV

because all the other dependencies seem to be pointless.

HOTPLUG_PCI_POWERNV already has a

        depends on PPC_POWERNV && EEH

so there's no point in repeating those.

And PPC_XIVE_NATIVE is selected by PPC_POWERNV, so if PPC_POWERNV, we
know PPC_XIVE_NATIVE is set.

Maybe I missed something strange, so I'm just letting you know so you
can blame me if I broke something.

              Linus