On Sat, 09 Nov 2019 12:29:17 -0800 (PST)
David Miller <davem@xxxxxxxxxxxxx> wrote:
> Please double check my conflict resoltuion for samples/bpf/Makefile
Looks okay[1] -- I have a patch doing exactly the same adjustment to
Bjørns patch which conflicted with Ivan's patch 10cb3d8706db
("samples/bpf: Use own flags but not HOSTCFLAGS").
[1] https://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git/diff/samples/bpf/Makefile?id=14684b93019a2d2ece0df5acaf921924541b928d
Thanks for merging these, as the fixes for samples/bpf/ now seems to
have reached your tree. I'll send a followup to fix the rest and also
adjust/correct the documentation in samples/bpf/README.rst.
--
Best regards,
Jesper Dangaard Brouer
MSc.CS, Principal Kernel Engineer at Red Hat
LinkedIn: http://www.linkedin.com/in/brouer
