netdev - Re: linux-next: manual merge of the bpf-next tree with the jc

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>] [day] [month] [year] [list]

Date:   Mon, 15 Apr 2019 07:45:20 -0600
From:   Jonathan Corbet <corbet@....net>
To:     Alex Shi <alex.shi@...ux.alibaba.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Networking <netdev@...r.kernel.org>,
        David Miller <davem@...emloft.net>,
        Daniel Borkmann <daniel@...earbox.net>,
        Alexei Starovoitov <ast@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the jc_docs
 tree

On Mon, 15 Apr 2019 09:55:31 +0800
Alex Shi <alex.shi@...ux.alibaba.com> 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.

jon