]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc4
authorAlexei Starovoitov <ast@kernel.org>
Mon, 28 Apr 2025 15:40:45 +0000 (08:40 -0700)
committerAlexei Starovoitov <ast@kernel.org>
Mon, 28 Apr 2025 15:40:45 +0000 (08:40 -0700)
commit224ee86639f57818cf4e05bd86eb7d9f31baac8d
treecbe03eeaf350d550e14809d2c6c40e0881dd5e4d
parent91dbac4076537b464639953c055c460d2bdfc7ea
parentb4432656b36e5cc1d50a1f2dc15357543add530e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf after rc4

Cross-merge bpf and other fixes after downstream PRs.

No conflicts.

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
kernel/bpf/hashtab.c
tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c