]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc5+
authorAlexei Starovoitov <ast@kernel.org>
Sat, 15 Nov 2025 01:43:41 +0000 (17:43 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Sat, 15 Nov 2025 01:43:41 +0000 (17:43 -0800)
commite47b68bda4de6a848a8b6c79316542326a8fb3ca
treebb1300a3177f5c92e2698fab42178f160f41316e
parentef2c0b2e56ad710a2b5a85b678a6c685756e03a4
parent7a0892d2836e12cc61b6823f888629a3eb64e268
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after 6.18-rc5+

Cross-merge BPF and other fixes after downstream PR.

Minor conflict in kernel/bpf/helpers.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
MAINTAINERS
kernel/bpf/helpers.c
kernel/bpf/stream.c
kernel/bpf/trampoline.c
kernel/bpf/verifier.c