git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 21 Feb 2020 21:39:34 +0000 (13:39 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 21 Feb 2020 21:39:34 +0000 (13:39 -0800)
commit	26d5d48b43f6dd568ead10f46ccbf7c9f732e277
tree	04b1728c397ad4604a6163529f51dfd48dfdbc07	tree \| snapshot
parent	b3350d5faa2823619f039d3284bd9a03ce9b1274	commit \| diff
parent	8cc5927552689e78c7eee095392b1ab4a8793150	commit \| diff

Merge git://git.kernel.org/pub/scm/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>

Linux Kernel Source Tree.

RSS Atom

drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/en/health.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/broadcom.c	diff1 \|	diff2 \|	blob \| history
net/core/rtnetlink.c	diff1 \|	diff2 \|	blob \| history
net/netlink/af_netlink.c	diff1 \|	diff2 \|	blob \| history
net/openvswitch/flow_netlink.c	diff1 \|	diff2 \|	blob \| history
net/sched/cls_flower.c	diff1 \|	diff2 \|	blob \| history