From: David S. Miller <davem@davemloft.net>
Date: Sat, 2 Jun 2018 12:07:52 +0000 (-0400)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Tag: v4.17~4^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=cd075ce4679ca7797734c4f6c5aa23878c8e2208;p=linux-2.6-block.git

Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2018-06-02

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.

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.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

cd075ce4679ca7797734c4f6c5aa23878c8e2208