David S. Miller f83f715195 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Minor comment merge conflict in mlx5. Staging driver has a fixup due to the skb->xmit_more changes in 'net-next', but was removed in 'net'. Signed-off-by: David S. Miller <davem@davemloft.net>		2019-04-05 14:14:19 -07:00
..
hns3pf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-05 14:14:19 -07:00
hns3vf	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2019-04-05 14:14:19 -07:00
hclge_mbx.h	net: hns3: modify the VF network port media type acquisition method	2019-04-04 10:20:38 -07:00
hnae3.c	net: hns3: split function hnae3_match_n_instantiate()	2019-04-04 10:20:39 -07:00
hnae3.h	net: hns3: fix to stop multiple HNS reset due to the AER changes	2019-03-09 22:58:47 -08:00
hns3_dcbnl.c	net: hns3: use HNS3_NIC_STATE_RESETTING to indicate resetting	2018-11-07 11:42:17 -08:00
hns3_debugfs.c	net: hns3: Add "tm map" status information query function	2018-12-15 10:54:18 -08:00
hns3_enet.c	net: hns3: modify HNS3_NIC_STATE_INITED flag in hns3_reset_notify_uninit_enet	2019-04-04 10:20:39 -07:00
hns3_enet.h	net: hns3: minor optimization for ring_space	2019-04-04 10:20:38 -07:00
hns3_ethtool.c	net: hns3: check resetting status in hns3_get_stats()	2019-04-04 10:20:39 -07:00
Makefile	net: hns3: Add debugfs framework registration	2018-11-23 17:28:59 -08:00