netdev - Re: [PATCH net-next] selftests/bpf: fix merge conflict

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: <20170406.122318.728530095245844162.davem@davemloft.net>
Date:   Thu, 06 Apr 2017 12:23:18 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     ast@...com
Cc:     daniel@...earbox.net, netdev@...r.kernel.org
Subject: Re: [PATCH net-next] selftests/bpf: fix merge conflict

From: Alexei Starovoitov <ast@...com>
Date: Thu, 6 Apr 2017 12:20:26 -0700

> fix artifact of merge resolution
> 
> Signed-off-by: Alexei Starovoitov <ast@...nel.org>
> Acked-by: Daniel Borkmann <daniel@...earbox.net>

Sorry about that, applied, thanks!