linux-kernel - 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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <69ce8d2b-8ae8-29aa-96c9-f2c0356dbea5@iogearbox.net>
Date:   Thu, 18 Nov 2021 00:20:20 +0100
From:   Daniel Borkmann <daniel@...earbox.net>
To:     Stephen Rothwell <sfr@...b.auug.org.au>,
        Alexei Starovoitov <ast@...nel.org>,
        Networking <netdev@...r.kernel.org>,
        Jonathan Corbet <corbet@....net>
Cc:     Dave Tucker <dave@...cker.co.uk>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Mauro Carvalho Chehab <mchehab+huawei@...nel.org>
Subject: Re: linux-next: manual merge of the bpf-next tree with the jc_docs
 tree

On 11/18/21 12:13 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the bpf-next tree got a conflict in:
> 
>    Documentation/bpf/index.rst
> 
> between commit:
> 
>    1c1c3c7d08d8 ("libbpf: update index.rst reference")
> 
> from the jc_docs tree and commit:
> 
>    5931d9a3d052 ("bpf, docs: Fix ordering of bpf documentation")
> 
> from the bpf-next tree.
> 
> I fixed it up (the latter removed the line updated by the former, so I
> just the latter) and can carry the fix as necessary.
Ack, sounds good. Dave's rework fixed it implicitly.