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  PHC 
Open Source and information security mailing list archives
Hash Suite for Android: free password hash cracker in your pocket
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:   Wed, 20 Feb 2019 12:03:05 +1100
From:   Stephen Rothwell <>
To:     Stanislav Fomichev <>
Cc:     Alexei Starovoitov <>,
        David Miller <>,
        Networking <>,
        Daniel Borkmann <>,
        Alexei Starovoitov <>,
        Linux Next Mailing List <>,
        Linux Kernel Mailing List <>
Subject: Re: linux-next: manual merge of the net-next tree with the bpf tree

Hi Stanislav,

On Tue, 19 Feb 2019 16:45:46 -0800 Stanislav Fomichev <> wrote:
> OTOH, I don't understand why is there a conflict? bpf and bpf-next
> adding tests in the same place/file? Those can be trivially resolved
> when bpf and bpf-next are merged in the next window.

Yes, and yes :-)

Stephen Rothwell

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists