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

Cross-merge BPF and other fixes after downstream PR.
No conflicts.

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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc net/core/filter.c
Simple merge