Skip to content
Commit b6df0078 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files


Trivial conflict in net/netfilter/nf_tables_api.c.

Duplicate fix in tools/testing/selftests/net/devlink_port_split.py
- take the net-next version.

skmsg, and L4 bpf - keep the bpf code but remove the flags
and err params.

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 3f8ad50a a118ff66
Loading
Loading
Loading
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