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:   Wed, 29 Apr 2020 08:47:02 +0200
From:   Christoph Hellwig <>
To:     Stephen Rothwell <>
Cc:     Andrew Morton <>,
        Daniel Borkmann <>,
        Alexei Starovoitov <>,
        Networking <>,
        Linux Next Mailing List <>,
        Linux Kernel Mailing List <>,
        Christoph Hellwig <>,
        Al Viro <>,
        Xiaoming Ni <>,
        "Guilherme G. Piccoli" <>
Subject: Re: linux-next: manual merge of the akpm-current tree with the
 bpf-next tree

On Wed, Apr 29, 2020 at 04:45:07PM +1000, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the akpm-current tree got a conflict in:
>   kernel/sysctl.c
> between commit:
>   f461d2dcd511 ("sysctl: avoid forward declarations")
> from the bpf-next tree and commits:

Hmm, the above should have gone in through Al..

Powered by blists - more mailing lists