Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
authorDavid S. Miller <davem@davemloft.net>
Fri, 21 Feb 2020 21:39:34 +0000 (13:39 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 21 Feb 2020 21:39:34 +0000 (13:39 -0800)
commite65ee2fb54d4745d7b7d9061d7fe33c5c5bf3b06
tree04b1728c397ad4604a6163529f51dfd48dfdbc07
parentb4d9785ce5c035b672f25df56706d0ff4e68b74e
parent0c0ddd6ae47c9238c18f475bcca675ca74c9dc31
Merge git://git./linux/kernel/git/netdev/net

Conflict resolution of ice_virtchnl_pf.c based upon work by
Stephen Rothwell.

Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c
drivers/net/ethernet/intel/ice/ice_ethtool.c
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
drivers/net/ethernet/mellanox/mlx5/core/en/health.c
drivers/net/phy/broadcom.c
net/core/rtnetlink.c
net/netlink/af_netlink.c
net/openvswitch/flow_netlink.c
net/sched/cls_flower.c