Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorDavid S. Miller <davem@davemloft.net>
Sun, 16 Jun 2019 01:19:47 +0000 (18:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 16 Jun 2019 01:19:47 +0000 (18:19 -0700)
Alexei Starovoitov says:

====================
pull-request: bpf 2019-06-15

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

The main changes are:

1) fix stack layout of JITed x64 bpf code, from Alexei.

2) fix out of bounds memory access in bpf_sk_storage, from Arthur.

3) fix lpm trie walk, from Jonathan.

4) fix nested bpf_perf_event_output, from Matt.

5) and several other fixes.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
1  2 
net/core/sock.c

diff --cc net/core/sock.c
Simple merge