]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 07fa75f) | patch
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)
commitd934fe11a1693d1bba0752b069395ad1d3f4ed0a
treecf6859bd3c44bc865f3248810d66a165bd757f8ftree | snapshot
parent07fa75f63b04447645fb000c1445b58e78fdebb4commit | diff
net: re-solve some conflicts after net -> net-next merge

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