Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf at 6.18-rc2

Cross-merge BPF and other fixes after downstream PR.

No conflicts.

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

diff --cc include/linux/bpf.h
Simple merge

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

diff --cc net/bpf/test_run.c
Simple merge