]> 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>
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)
commit5d84e45dbc955af849ce3442c00b4f1a2e9488ab
tree78f6840a6e8991be13c14f95313012a42e27d800
parent5bf6af9e1efe33bce3c9868ab37dbe9c8f2337bb
parent76f0f109e0b843cdfd34ed87bfe29d89c4da37c7
Merge git://git.kernel.org/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>