dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net: re-solve some conflicts after net -> net-next merge

Browse Source 
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2021-02-16 23:12:23 -08:00
parent d489ded1a3
commit b646acd5eb
5 changed files with 11 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/testing/selftests/net/forwarding/tc_flower.sh
+2 -1
View File
@@ -3,7 +3,8 @@
ALL_TESTS="match_dst_mac_test match_src_mac_test match_dst_ip_test \
match_src_ip_test match_ip_flags_test match_pcp_test match_vlan_test \
match_ip_tos_test match_indev_testmatch_ip_ttl_test match_mpls_label_test \
match_ip_tos_test match_indev_test match_ip_ttl_test
match_mpls_label_test \
match_mpls_tc_test match_mpls_bos_test match_mpls_ttl_test \
match_mpls_lse_test"
NUM_NETIFS=2