[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <CAF2d9jj2ijVaqgkzjGFdjtX9fOaiehE=owucwfaqX159v9u8Zw@mail.gmail.com>
Date: Thu, 27 Jun 2019 11:19:02 -0700
From: Mahesh Bandewar (महेश बंडेवार)
<maheshb@...gle.com>
To: David Miller <davem@...emloft.net>
Cc: linux-netdev <netdev@...r.kernel.org>,
Eric Dumazet <edumazet@...gle.com>, michael.chan@...adcom.com,
dja@...ens.net, mahesh@...dewar.net
Subject: Re: [PATCH next 3/3] blackhole_dev: add a selftest
On Thu, Jun 27, 2019 at 11:08 AM David Miller <davem@...emloft.net> wrote:
>
> 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...
>
oops, my bad! Let me send v2
> :-)
Powered by blists - more mailing lists