Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 Nov 2019 23:46:58 +0000 (15:46 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Nov 2019 23:46:58 +0000 (15:46 -0800)
commit622dc5ad8052f4f0c6b7a12787696a5caa3c6a58
treed869a2aefe3deed534a4bfc35073e93e6d0e2047
parentadf6f8cb3f4c2a15d5f35e6cf9ffeb6856d35312
parentb615e5a1e067dcb327482d1af7463268b89b1629
Merge git://git./linux/kernel/git/bpf/bpf-next

Daniel Borkmann says:

====================
pull-request: bpf-next 2019-11-26

The following pull-request contains BPF updates for your *net-next* tree.

We've added 2 non-merge commits during the last 1 day(s) which contain
a total of 2 files changed, 14 insertions(+), 3 deletions(-).

The main changes, 2 small fixes are:

1) Fix libbpf out of tree compilation which complained about unknown u32
   type used in libbpf_find_vmlinux_btf_id() which needs to be __u32 instead,
   from Andrii Nakryiko.

2) Follow-up fix for the prior BPF mmap series where kbuild bot complained
   about missing vmalloc_user_node_flags() for no-MMU, also from Andrii Nakryiko.
====================

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