linux-kernel - Re: linux-next: manual merge of the net-next tree with the net tree

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: <59E8A3DA.5070905@iogearbox.net>
Date:   Thu, 19 Oct 2017 15:08:42 +0200
From:   Daniel Borkmann <daniel@...earbox.net>
To:     Mark Brown <broonie@...nel.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>,
        Alexei Starovoitov <ast@...nel.org>,
        John Fastabend <john.fastabend@...il.com>,
        Jakub Kicinski <jakub.kicinski@...ronome.com>,
        Edward Cree <ecree@...arflare.com>
CC:     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 net-next tree with the net tree

On 10/19/2017 03:05 PM, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
>    tools/testing/selftests/bpf/test_verifier.c
>
> between commit:
>
>    28e33f9d78eef ("bpf: disallow arithmetic operations on context pointer")
>
> from the net tree and commit:
>
>    22c8852624fc9 ("bpf: improve selftests and add tests for meta pointer")
>
> from the net-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This

LGTM, thanks.