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  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]
Date:   Fri, 16 Oct 2020 12:22:23 -0700
From:   Linus Torvalds <>
To:     Michael Ellerman <>
Cc:, "Aneesh Kumar K.V" <>,,,, Qian Cai <>,,
        Christophe Leroy <>,,
        Colin King <>,
        David Miller <>,
        Daniel Axtens <>,,,,, Christoph Hellwig <>,,,
        Joel Stanley <>,,, Li Yang <>,
        Linux Kernel Mailing List <>,
        linuxppc-dev <>,,,,,,
        "Naveen N. Rao" <>,
        Nick Piggin <>,
        "Oliver O'Halloran" <>,
        Paul Mackerras <>,
        Peter Zijlstra <>,
        Ravi Bangoria <>,
        Russell Currey <>,
        Stephen Rothwell <>,
        Srikar Dronamraju <>,
        Stephen Kitt <>,
        Vaibhav Jain <>,,
        Wolfram Sang <>,,, zhengbin <>
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 <> 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.


        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.


Powered by blists - more mailing lists