linux_dsm_epyc7002/drivers/net/ethernet/mellanox/mlx4
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
..
alloc.c net/mlx4: Avoid wrong virtual mappings 2016-05-05 23:23:05 -04:00
catas.c net/mlx4_core: Avoid command timeouts during VF driver device shutdown 2017-01-30 15:45:27 -05:00
cmd.c ethernet :mellanox :mlx4: Replace pci_pool_alloc by pci_pool_zalloc 2016-11-30 14:56:36 -05:00
cq.c net/mlx4_core: Fix racy CQ (Completion Queue) free 2017-01-16 15:08:28 -05:00
en_clock.c net/mlx4_en: Fix type mismatch for 32-bit systems 2016-12-29 14:17:40 -05:00
en_cq.c net/mlx4_en: remove napi_hash_del() call 2016-11-17 11:17:05 -05:00
en_dcb_nl.c net/mlx4_en: Fixes for DCBX 2016-09-11 19:40:26 -07:00
en_ethtool.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-02-07 16:29:30 -05:00
en_main.c net/mlx4_en: Refactor the XDP forwarding rings scheme 2016-11-02 15:07:11 -04:00
en_netdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-02-07 16:29:30 -05:00
en_port.c mlx4: fix use-after-free in mlx4_en_fold_software_stats() 2016-12-02 13:33:32 -05:00
en_port.h net/mlx4_en: Check the enabling pptx/pprx flags in SET_PORT wrapper flow 2017-01-30 15:26:43 -05:00
en_resources.c net/mlx4: Avoid wrong virtual mappings 2016-05-05 23:23:05 -04:00
en_rx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-02-07 16:29:30 -05:00
en_selftest.c mlx4: use reset to set mac header 2016-12-03 15:49:16 -05:00
en_tx.c net/mlx4_core: Get num_tc using netdev_get_num_tc 2017-01-30 15:26:42 -05:00
eq.c net/mlx4_core: Eliminate warning messages for SRQ_LIMIT under SRIOV 2017-01-16 15:08:29 -05:00
fw_qos.c
fw_qos.h
fw.c net/mlx4_en: Pass user MTU value to Firmware at set port command 2017-01-30 15:26:43 -05:00
fw.h mlx4: remove unused fields 2016-09-30 01:56:41 -04:00
icm.c net/mlx4: Remove BUG_ON from ICM allocation routine 2016-12-29 14:17:40 -05:00
icm.h
intf.c net/mlx4_core: Avoid command timeouts during VF driver device shutdown 2017-01-30 15:45:27 -05:00
Kconfig ptp_clock: Allow for it to be optional 2016-11-16 09:26:34 +01:00
main.c net/mlx4: Replace ENOSYS with better fitting error codes 2017-01-30 15:26:41 -05:00
Makefile
mcg.c net/mlx4: Fix uninitialized fields in rule when adding promiscuous mode to device managed flow steering 2016-11-28 15:33:46 -05:00
mlx4_en.h mlx4: xdp_prog becomes inactive after ethtool '-L' or '-G' 2017-02-02 21:27:05 -05:00
mlx4_stats.h net/mlx4_en: Add ethtool statistics for XDP cases 2016-11-02 15:07:11 -04:00
mlx4.h Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2017-02-02 16:54:00 -05:00
mr.c net/mlx4: Fix some indent inconsistancy 2016-07-04 15:22:33 -07:00
pd.c io-mapping: Specify mapping size for io_mapping_map_wc() 2016-04-28 12:17:32 +01:00
port.c net/mlx4_en: fix a condition 2017-02-06 12:01:06 -05:00
profile.c
qp.c
reset.c
resource_tracker.c net/mlx4_core: Add resource alloc/dealloc debugging 2017-01-30 15:26:42 -05:00
sense.c
srq.c net/mlx4_core: Use RCU to perform radix tree lookup for SRQ 2016-09-21 21:52:43 -04:00