Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
authorDavid S. Miller <davem@davemloft.net>
Fri, 2 Apr 2021 18:03:07 +0000 (11:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 2 Apr 2021 18:03:07 +0000 (11:03 -0700)
commitc2bcb4cf021121d7c162e44b7773281891e3abc2
tree8f37f13ff2292f0435cd523507d40b7a384cb8c6
parentbd78980be1a68d14524c51c4b4170782fada622b
parent89d69c5d0fbcabd8656459bc8b1a476d6f1efee4
Merge git://git./linux/kernel/git/bpf/bpf-next

Alexei Starovoitov says:

====================
pull-request: bpf-next 2021-04-01

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

We've added 68 non-merge commits during the last 7 day(s) which contain
a total of 70 files changed, 2944 insertions(+), 1139 deletions(-).

The main changes are:

1) UDP support for sockmap, from Cong.

2) Verifier merge conflict resolution fix, from Daniel.

3) xsk selftests enhancements, from Maciej.

4) Unstable helpers aka kernel func calling, from Martin.

5) Batches ops for LPM map, from Pedro.

6) Fix race in bpf_get_local_storage, from Yonghong.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
include/net/udp.h
net/ipv4/udp.c
net/ipv6/af_inet6.c
net/ipv6/udp.c