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

Cross-merge bpf and other fixes after downstream PRs.

No conflicts.

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

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

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