Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorJakub Kicinski <kuba@kernel.org>
Thu, 22 Oct 2020 16:51:41 +0000 (09:51 -0700)
committerJakub Kicinski <kuba@kernel.org>
Thu, 22 Oct 2020 16:51:41 +0000 (09:51 -0700)
commitd2775984d0567e8262d11f3e607a4345cc7b467d
tree52a136f9abe6810fdd440cd3f6016db8b7740764
parentd9b0e599b2b892422f1cbc5d2658049b895b2b58
parent3652c9a1b1fe6cbdd4510eb220db548bff8704ae
Merge git://git./pub/scm/linux/kernel/git/bpf/bpf

Daniel Borkmann says:

====================
pull-request: bpf 2020-10-22

1) Fix enforcing NULL check in verifier for new helper return types of
   RET_PTR_TO_{BTF_ID,MEM_OR_BTF_ID}_OR_NULL, from Martin KaFai Lau.

2) Fix bpf_redirect_neigh() helper API before it becomes frozen by adding
   nexthop information as argument, from Toke Høiland-Jørgensen.

3) Guard & fix compilation of bpf_tail_call_static() when __bpf__ arch is
   not defined by compiler or clang too old, from Daniel Borkmann.

4) Remove misplaced break after return in attach_type_to_prog_type(), from
   Tom Rix.
====================

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