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>] [day] [month] [year] [list]
Date:   Mon, 15 Apr 2019 07:45:20 -0600
From:   Jonathan Corbet <>
To:     Alex Shi <>
Cc:     Stephen Rothwell <>,
        Networking <>,
        David Miller <>,
        Daniel Borkmann <>,
        Alexei Starovoitov <>,
        Linux Next Mailing List <>,
        Linux Kernel Mailing List <>
Subject: Re: linux-next: manual merge of the bpf-next tree with the jc_docs

On Mon, 15 Apr 2019 09:55:31 +0800
Alex Shi <> wrote:

> > This is now a conflict between the net-next tree and the jc_docs tree.  
> Sorry, Stephen, What I can do for this?

What you can do is to not worry.  A trivial conflict like this is easily
handled when everything goes upsteam.


Powered by blists - more mailing lists