Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 7.0-rc1

Cross-merge trees after 7.0-rc1.

No conflicts.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --cc drivers/net/ethernet/netronome/nfp/bpf/verifier.c
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge