net: re-solve some conflicts after net -> net-next merge
authorJakub Kicinski <kuba@kernel.org>
Wed, 17 Feb 2021 06:58:44 +0000 (22:58 -0800)
committerJakub Kicinski <kuba@kernel.org>
Wed, 17 Feb 2021 07:12:23 +0000 (23:12 -0800)
commitb646acd5eb48ec49ef90404336d7e8ee502ecd05
treecf6859bd3c44bc865f3248810d66a165bd757f8f
parentd489ded1a3690d7eca8633575cba3f7dac8484c7
net: re-solve some conflicts after net -> net-next merge

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/ibm/ibmvnic.c
drivers/net/ethernet/ibm/ibmvnic.h
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
drivers/net/ethernet/realtek/r8169_main.c
tools/testing/selftests/net/forwarding/tc_flower.sh