bpf.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* net --> net-next merge
@ 2019-11-09 20:29 David Miller
  2019-11-10 16:12 ` Jesper Dangaard Brouer
  2019-11-11 13:39 ` Daniel Borkmann
  0 siblings, 2 replies; 3+ messages in thread
From: David Miller @ 2019-11-09 20:29 UTC (permalink / raw)
  To: ast; +Cc: daniel, netdev, bpf


Please double check my conflict resoltuion for samples/bpf/Makefile

Thank you.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: net --> net-next merge
  2019-11-09 20:29 net --> net-next merge David Miller
@ 2019-11-10 16:12 ` Jesper Dangaard Brouer
  2019-11-11 13:39 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: Jesper Dangaard Brouer @ 2019-11-10 16:12 UTC (permalink / raw)
  To: David Miller
  Cc: brouer, ast, daniel, netdev, bpf, Ivan Khoronzhuk,
	Björn Töpel, Arnaldo Carvalho de Melo

On Sat, 09 Nov 2019 12:29:17 -0800 (PST)
David Miller <davem@davemloft.net> 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


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: net --> net-next merge
  2019-11-09 20:29 net --> net-next merge David Miller
  2019-11-10 16:12 ` Jesper Dangaard Brouer
@ 2019-11-11 13:39 ` Daniel Borkmann
  1 sibling, 0 replies; 3+ messages in thread
From: Daniel Borkmann @ 2019-11-11 13:39 UTC (permalink / raw)
  To: David Miller, ast; +Cc: netdev, bpf

On 11/9/19 9:29 PM, David Miller wrote:
> 
> Please double check my conflict resoltuion for samples/bpf/Makefile

Looks good, thanks!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-11-11 13:39 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-09 20:29 net --> net-next merge David Miller
2019-11-10 16:12 ` Jesper Dangaard Brouer
2019-11-11 13:39 ` Daniel Borkmann

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).