From: Alexei Starovoitov <ast@kernel.org>
Date: Mon, 16 Dec 2024 16:52:55 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
X-Git-Tag: v6.14-rc1~133^2~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=06103dccbbd29408255a409f6f98f7f02387dc93;p=thirdparty%2Fkernel%2Fstable.git

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

Cross-merge bpf fixes after downstream PR.

No conflicts.

Adjacent changes in:
Auto-merging include/linux/bpf.h
Auto-merging include/linux/bpf_verifier.h
Auto-merging kernel/bpf/btf.c
Auto-merging kernel/bpf/verifier.c
Auto-merging kernel/trace/bpf_trace.c
Auto-merging tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c

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

06103dccbbd29408255a409f6f98f7f02387dc93