David S. Miller 3efa70d78f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>		2017-02-07 16:29:30 -05:00
..
hnae.c	net: hns: fix device reference leaks	2016-11-07 13:17:30 -05:00
hnae.h	net: hns: Fix to conditionally convey RX checksum flag to stack	2016-12-06 11:41:57 -05:00
hns_ae_adapt.c	net: hns: add the support to add/remove the ucast entry to/from table	2016-11-10 11:45:37 -05:00
hns_dsaf_gmac.c	net: hns: modify ethtool statistics value error	2016-11-10 11:45:37 -05:00
hns_dsaf_gmac.h
hns_dsaf_mac.c	net: hns: add the support to add/remove the ucast entry to/from table	2016-11-10 11:45:37 -05:00
hns_dsaf_mac.h	net: hns: add the support to add/remove the ucast entry to/from table	2016-11-10 11:45:37 -05:00
hns_dsaf_main.c	net: hns: add the support to add/remove the ucast entry to/from table	2016-11-10 11:45:37 -05:00
hns_dsaf_main.h	net: hns: add the support to add/remove the ucast entry to/from table	2016-11-10 11:45:37 -05:00
hns_dsaf_misc.c	net: hns: fix to intimate the link-status change by adding LF/RF method	2016-11-10 11:45:37 -05:00
hns_dsaf_misc.h	net: hns: Add support of ACPI to HNS driver RoCE Reset function	2016-08-25 10:05:10 -04:00
hns_dsaf_ppe.c	net: hns: dereference ppe_cb->ppe_common_cb if it is non-null	2016-08-26 11:44:56 -07:00
hns_dsaf_ppe.h	net: hns: separate debug dsaf device from service dsaf device	2016-04-26 01:09:17 -04:00
hns_dsaf_rcb.c	net: hns: bug fix about setting coalsecs-usecs to 0	2016-10-03 11:40:57 -04:00
hns_dsaf_rcb.h	net: hns: change the default coalesce usecs	2016-06-21 04:51:56 -04:00
hns_dsaf_reg.h	hns: avoid stack overflow with CONFIG_KASAN	2017-02-06 12:02:32 -05:00
hns_dsaf_xgmac.c	net: hns: fix to intimate the link-status change by adding LF/RF method	2016-11-10 11:45:37 -05:00
hns_dsaf_xgmac.h	net: hns: fix to intimate the link-status change by adding LF/RF method	2016-11-10 11:45:37 -05:00
hns_enet.c	hns_enet: use cpumask_var_t for on-stack mask	2017-02-03 11:14:50 -05:00
hns_enet.h	net: ethernet: hisilicon: hns: use phydev from struct net_device	2016-09-22 02:11:40 -04:00
hns_ethtool.c	net: hns: bug fix about restart auto-negotiation	2016-11-10 11:45:37 -05:00
Makefile	net: add Hisilicon Network Subsystem basic ethernet support	2015-09-20 21:42:58 -07:00