Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Fri, 10 Jul 2020 21:07:43 +0000 (14:07 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Jul 2020 21:07:43 +0000 (14:07 -0700)
commit45ae836f8a257599ae11873e2642101a96b40a4c
tree78f6840a6e8991be13c14f95313012a42e27d800
parentca68d5637aaff64d4838f609708ecf592d67bfe0
parentb2f9f1535bb93ee5fa2ea30ac1c26fa0d676154c
Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Alexei Starovoitov says:

====================
pull-request: bpf 2020-07-09

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

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

The main changes are:

1) fix crash in libbpf on 32-bit archs, from Jakub and Andrii.

2) fix crash when l2tp and bpf_sk_reuseport conflict, from Martin.
====================

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