-
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net由 Jakub Kicinski 提交于
Conflicts: drivers/net/ethernet/ibm/ibmvnic.c Signed-off-by: NJakub Kicinski <kuba@kernel.org>55fd59b0
Conflicts:
drivers/net/ethernet/ibm/ibmvnic.c
Signed-off-by: NJakub Kicinski <kuba@kernel.org>