From: Jakub Kicinski <kuba@kernel.org>
Date: Thu, 22 Oct 2020 16:51:41 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Tag: v5.10.7~1334^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d2775984d0567e8262d11f3e607a4345cc7b467d;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

d2775984d0567e8262d11f3e607a4345cc7b467d