]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
authorAlexei Starovoitov <ast@kernel.org>
Wed, 13 Nov 2024 20:51:15 +0000 (12:51 -0800)
committerAlexei Starovoitov <ast@kernel.org>
Wed, 13 Nov 2024 20:52:51 +0000 (12:52 -0800)
commit871438170326dc28125cb823d19c1d5c5304474d
tree789e34628d77dc234f1b6e893c237969c6e14287
parentb41ec3e6053a1e408da8ce02be6cc8885aa41848
parent9f8e716d46c68112484a23d1742d9ec725e082fc
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf

Cross-merge bpf fixes after downstream PR.

In particular to bring the fix in
commit aa30eb3260b2 ("bpf: Force checkpoint when jmp history is too long").
The follow up verifier work depends on it.
And the fix in
commit 6801cf7890f2 ("selftests/bpf: Use -4095 as the bad address for bits iterator").
It's fixing instability of BPF CI on s390 arch.

No conflicts.

Adjacent changes in:
Auto-merging arch/Kconfig
Auto-merging kernel/bpf/helpers.c
Auto-merging kernel/bpf/memalloc.c
Auto-merging kernel/bpf/verifier.c
Auto-merging mm/slab_common.c

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
arch/Kconfig
kernel/bpf/helpers.c
kernel/bpf/memalloc.c
kernel/bpf/verifier.c
mm/slab_common.c