netdev - Re: [PATCH next 3/3] blackhole

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

Message-Id: <20190627.110852.372215308913618999.davem@davemloft.net>
Date:   Thu, 27 Jun 2019 11:08:52 -0700 (PDT)
From:   David Miller <davem@...emloft.net>
To:     maheshb@...gle.com
Cc:     netdev@...r.kernel.org, edumazet@...gle.com,
        michael.chan@...adcom.com, dja@...ens.net, mahesh@...dewar.net
Subject: Re: [PATCH next 3/3] blackhole_dev: add a selftest

From: Mahesh Bandewar <maheshb@...gle.com>
Date: Fri, 21 Jun 2019 17:45:39 -0700

> --- a/tools/testing/selftests/net/Makefile
> +++ b/tools/testing/selftests/net/Makefile
> @@ -4,8 +4,9 @@
>  CFLAGS =  -Wall -Wl,--no-as-needed -O2 -g
>  CFLAGS += -I../../../../usr/include/
>  
> +<<<<<<< HEAD
>  TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \

Ummm... yeah... might want to resolve this conflict...

:-)