mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-15 19:56:03 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
13dfb3fa49
1062 changed files with 28321 additions and 26433 deletions
9
tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh
Executable file
9
tools/testing/selftests/bpf/test_xdp_vlan_mode_generic.sh
Executable file
9
tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh
Executable file
9
tools/testing/selftests/bpf/test_xdp_vlan_mode_native.sh
Executable file
4
tools/testing/selftests/net/.gitignore
vendored
4
tools/testing/selftests/net/.gitignore
vendored
Loading…
Add table
Add a link
Reference in a new issue