linux_dsm_epyc7002/drivers/net/ethernet/intel/fm10k
David S. Miller ac80010fc9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Mere overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>
2019-12-22 15:15:05 -08:00
..
fm10k_common.c net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_common.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_dcbnl.c fm10k: reduce scope of the err variable 2019-08-01 13:57:33 -07:00
fm10k_debugfs.c fm10k: no need to check return value of debugfs_create functions 2019-08-10 15:25:48 -07:00
fm10k_ethtool.c treewide: Use sizeof_field() macro 2019-12-09 10:36:44 -08:00
fm10k_iov.c fm10k: add support for ndo_get_vf_stats operation 2019-11-04 13:12:14 -08:00
fm10k_main.c fm10k: update driver version to match out-of-tree 2019-11-04 13:12:15 -08:00
fm10k_mbx.c fm10k: mark unused parameters with __always_unused 2019-08-04 04:36:49 -07:00
fm10k_mbx.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_netdev.c netdev: pass the stuck queue to the timeout handler 2019-12-12 21:38:57 -08:00
fm10k_pci.c fm10k: add support for ndo_get_vf_stats operation 2019-11-04 13:12:14 -08:00
fm10k_pf.c fm10k: fix fm10k_get_fault_pf to read correct address 2019-08-04 04:41:44 -07:00
fm10k_pf.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k_tlv.c fm10k: mark unused parameters with __always_unused 2019-08-04 04:36:49 -07:00
fm10k_tlv.h fm10k: add missing field initializers to TLV attributes) 2019-11-04 13:12:14 -08:00
fm10k_type.h fm10k: add support for ndo_get_vf_stats operation 2019-11-04 13:12:14 -08:00
fm10k_vf.c fm10k: mark unused parameters with __always_unused 2019-08-04 04:36:49 -07:00
fm10k_vf.h net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00
fm10k.h fm10k: add support for ndo_get_vf_stats operation 2019-11-04 13:12:14 -08:00
Makefile net: intel: Cleanup the copyright/license headers 2018-04-27 14:00:04 -04:00