tree 01fbc0680029418535d708935c7335b4c511523a
parent 2295cddf99e3f7c2be2b1160e2f5e53cc35b09be
parent 83c11c17553c0fca217105c17444c4ef5ab2403f
author Jakub Kicinski <kuba@kernel.org> 1602791100 -0700
committer Jakub Kicinski <kuba@kernel.org> 1602791100 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

Daniel Borkmann says:

====================
pull-request: bpf-next 2020-10-15

The main changes are:

1) Fix register equivalence tracking in verifier, from Alexei Starovoitov.

2) Fix sockmap error path to not call bpf_prog_put() with NULL, from Alex Dewar.

3) Fix sockmap to add locking annotations to iterator, from Lorenz Bauer.

4) Fix tcp_hdr_options test to use loopback address, from Martin KaFai Lau.
====================

Signed-off-by: Jakub Kicinski <kuba@kernel.org>