]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc5
authorAlexei Starovoitov <ast@kernel.org>
Wed, 14 Jan 2026 23:20:46 +0000 (15:20 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Wed, 14 Jan 2026 23:22:01 +0000 (15:22 -0800)
Cross-merge BPF and other fixes after downstream PR.

No conflicts.

Adjacent:
Auto-merging MAINTAINERS
Auto-merging Makefile
Auto-merging kernel/bpf/verifier.c
Auto-merging kernel/sched/ext.c
Auto-merging mm/memcontrol.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
1  2 
MAINTAINERS
Makefile
kernel/bpf/verifier.c
kernel/sched/ext.c
mm/memcontrol.c

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
diff --cc mm/memcontrol.c
Simple merge