diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-06-02 08:07:52 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-02 08:07:52 -0400 |
| commit | cd075ce4679ca7797734c4f6c5aa23878c8e2208 (patch) | |
| tree | 2bcce553c20dbb6a49019429ae89a0324b5e6b9c /Documentation | |
| parent | net: usb: cdc_mbim: add flag FLAG_SEND_ZLP (diff) | |
| parent | bpf: fix uapi hole for 32 bit compat applications (diff) | |
| download | linux-dev-cd075ce4679ca7797734c4f6c5aa23878c8e2208.tar.xz linux-dev-cd075ce4679ca7797734c4f6c5aa23878c8e2208.zip | |
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>
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions