netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: daniel@iogearbox.net
Cc: ast@kernel.org, netdev@vger.kernel.org
Subject: Re: pull-request: bpf 2018-06-02
Date: Sat, 02 Jun 2018 08:10:04 -0400 (EDT)	[thread overview]
Message-ID: <20180602.081004.1813460750616484991.davem@davemloft.net> (raw)
In-Reply-To: <20180602050722.24694-1-daniel@iogearbox.net>

From: Daniel Borkmann <daniel@iogearbox.net>
Date: Sat,  2 Jun 2018 07:07:22 +0200

> The following pull-request contains BPF updates for your *net* tree.
> 
> The main changes are:
> 
> 1) BPF uapi fix in struct bpf_prog_info and struct bpf_map_info in
>    order to fix offsets on 32 bit archs.
> 
> Please consider pulling these changes from:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
> 
> This will have a minor merge conflict with net-next which has the
> __u32 gpl_compatible:1 bitfield in struct bpf_prog_info at this
> location. Resolution is to use the gpl_compatible member.

Pulled, thanks Daniel.

      reply	other threads:[~2018-06-02 12:10 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-02  5:07 pull-request: bpf 2018-06-02 Daniel Borkmann
2018-06-02 12:10 ` 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=20180602.081004.1813460750616484991.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=ast@kernel.org \
    --cc=daniel@iogearbox.net \
    --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 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).