From: David Miller <davem@davemloft.net>
To: daniel@iogearbox.net
Cc: ast@kernel.org, saeedm@mellanox.com, netdev@vger.kernel.org,
bpf@vger.kernel.org
Subject: Re: pull-request: bpf-next 2019-07-03
Date: Thu, 04 Jul 2019 13:49:40 -0700 (PDT) [thread overview]
Message-ID: <20190704.134940.462462778251829402.davem@davemloft.net> (raw)
In-Reply-To: <20190703224740.15354-1-daniel@iogearbox.net>
From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu, 4 Jul 2019 00:47:40 +0200
> The following pull-request contains BPF updates for your *net-next* tree.
>
> There is a minor merge conflict in mlx5 due to 8960b38932be ("linux/dim:
> Rename externally used net_dim members") which has been pulled into your
> tree in the meantime, but resolution seems not that bad ... getting current
> bpf-next out now before there's coming more on mlx5. ;) I'm Cc'ing Saeed
> just so he's aware of the resolution below:
...
Thanks for the detailed merge resolution guidance, it helps a lot.
> Let me know if you run into any issues. Anyway, the main changes are:
...
> Please consider pulling these changes from:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
Pulled.
prev parent reply other threads:[~2019-07-04 20:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 22:47 pull-request: bpf-next 2019-07-03 Daniel Borkmann
2019-07-03 23:11 ` Saeed Mahameed
2019-07-03 23:13 ` Daniel Borkmann
2019-07-04 20:49 ` David Miller [this message]
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=20190704.134940.462462778251829402.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
/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 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).