On Thu, Jun 27, 2019 at 11:08 AM David Miller <da...@davemloft.net> wrote:
>
> From: Mahesh Bandewar <mahe...@google.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
> :-)
