Skip to content
Snippets Groups Projects
Commit e958da0d authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Cross-merge networking fixes after downstream PR.

Conflicts:

include/linux/filter.h
kernel/bpf/core.c
  66e13b61 ("bpf: verifier: prevent userspace memory access")
  d503a04f ("bpf: Add support for certain atomics in bpf_arena to x86 JIT")
https://lore.kernel.org/all/20240429114939.210328b0@canb.auug.org.au/



No adjacent changes.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents dcc61472 545c4944
No related branches found
No related tags found
No related merge requests found
Showing
with 420 additions and 79 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment