diff options
author | Jakub Kicinski <kuba@kernel.org> | 2021-06-30 01:45:27 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2021-06-30 01:45:27 +0300 |
commit | b6df00789e2831fff7a2c65aa7164b2a4dcbe599 (patch) | |
tree | a94cbeeca3f0ae2fffed008cb287c02dbee4dceb /tools/include | |
parent | 3f8ad50a9e43b6a59070e6c9c5eec79626f81095 (diff) | |
parent | a118ff661889ecee3ca90f8125bad8fb5bbc07d5 (diff) | |
download | linux-b6df00789e2831fff7a2c65aa7164b2a4dcbe599.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
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: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'tools/include')
0 files changed, 0 insertions, 0 deletions