]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Sat, 2 Jun 2018 12:07:52 +0000 (08:07 -0400)
committerDavid S. Miller <davem@davemloft.net>
Sat, 2 Jun 2018 12:07:52 +0000 (08:07 -0400)
commite4d5db68139f3d3b6ed30ffc6bc152cc04dc35c5
tree2bcce553c20dbb6a49019429ae89a0324b5e6b9c
parent8ee6fdf1a1456e79fd6b7cd7037f868e8d364eed
parentb17363895b2c2c97e5e6e8b2fe60a6e90e2e7d48
Merge git://git.kernel.org/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>