From: Jesper Dangaard Brouer <brouer@redhat.com>
To: David Miller <davem@davemloft.net>
Cc: brouer@redhat.com, ast@kernel.org, daniel@iogearbox.net,
netdev@vger.kernel.org, bpf@vger.kernel.org,
"Ivan Khoronzhuk" <ivan.khoronzhuk@linaro.org>,
"Björn Töpel" <bjorn.topel@intel.com>,
"Arnaldo Carvalho de Melo" <acme@redhat.com>
Subject: Re: net --> net-next merge
Date: Sun, 10 Nov 2019 17:12:53 +0100 [thread overview]
Message-ID: <20191110171253.63098254@carbon> (raw)
In-Reply-To: <20191109.122917.550362329016169460.davem@davemloft.net>
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
next prev parent reply other threads:[~2019-11-10 16:13 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-09 20:29 net --> net-next merge David Miller
2019-11-10 16:12 ` Jesper Dangaard Brouer [this message]
2019-11-11 13:39 ` Daniel Borkmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191110171253.63098254@carbon \
--to=brouer@redhat.com \
--cc=acme@redhat.com \
--cc=ast@kernel.org \
--cc=bjorn.topel@intel.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=ivan.khoronzhuk@linaro.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.