OSDN Git Service

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Wed, 17 Jun 2020 20:26:55 +0000 (13:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 17 Jun 2020 20:26:55 +0000 (13:26 -0700)
commitb9d37bbb55b8993d296a86fa21f98fa550b61967
tree73a93a246e9261c7738595af15e6f5a0cf44115a
parent69119673bd50b176ded34032fadd41530fb5af21
parent8030e250d882db174cbcd88273570ffb36a13080
Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Alexei Starovoitov says:

====================
pull-request: bpf 2020-06-17

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

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

The main changes are:

1) Important fix for bpf_probe_read_kernel_str() return value, from Andrii.

2) [gs]etsockopt fix for large optlen, from Stanislav.

3) devmap allocation fix, from Toke.
====================

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