Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc5

Cross-merge BPF and other fixes after downstream PR.

No conflicts.

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

diff --cc arch/riscv/Kconfig
Simple merge

diff --cc arch/riscv/net/bpf_jit_comp64.c
Simple merge

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

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

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

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

diff --cc tools/testing/selftests/bpf/prog_tests/timer.c
Simple merge

diff --cc tools/testing/selftests/bpf/progs/string_kfuncs_success.c
Simple merge