diff options
| author | Jakub Kicinski <[email protected]> | 2024-05-02 19:05:13 +0000 |
|---|---|---|
| committer | Jakub Kicinski <[email protected]> | 2024-05-02 19:06:25 +0000 |
| commit | e958da0ddbe831197a0023251880a4a09d5ba268 (patch) | |
| tree | eacded26f9563064a44fd1afe730493898adadb9 /tools/testing/selftests/net/lib/py/utils.py | |
| parent | Merge branch 'bnxt_en-updates-for-net-next' (diff) | |
| parent | Merge tag 'net-6.9-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netd... (diff) | |
| download | kernel-e958da0ddbe831197a0023251880a4a09d5ba268.tar.gz kernel-e958da0ddbe831197a0023251880a4a09d5ba268.zip | |
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
66e13b615a0c ("bpf: verifier: prevent userspace memory access")
d503a04f8bc0 ("bpf: Add support for certain atomics in bpf_arena to x86 JIT")
https://lore.kernel.org/all/[email protected]/
No adjacent changes.
Signed-off-by: Jakub Kicinski <[email protected]>
Diffstat (limited to 'tools/testing/selftests/net/lib/py/utils.py')
0 files changed, 0 insertions, 0 deletions