linux/drivers/net/ethernet/mellanox/mlx4
David S. Miller b633353115 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-02-23 00:09:14 -05:00
..
alloc.c net: Mellanox: Delete unnecessary checks before the function call "vunmap" 2015-02-09 14:10:05 -08:00
catas.c net/mlx4_core: Do not BUG_ON during reset when PCI is offline 2016-02-17 10:29:26 -05:00
cmd.c net/mlx4: fix some error handling in mlx4_multi_func_init() 2016-02-11 11:04:54 -05:00
cq.c net/mlx4_core: Set UAR page size to 4KB regardless of system page size 2016-02-17 10:29:27 -05:00
en_clock.c net/mlx4_en: Choose time-stamping shift value according to HW frequency 2016-02-17 10:29:25 -05:00
en_cq.c net: provide generic busy polling to all NAPI drivers 2015-11-18 16:17:42 -05:00
en_dcb_nl.c net/mlx4: New file for QoS related firmware commands 2015-04-02 16:25:02 -04:00
en_ethtool.c mlx4: remove mlx4_en_low_latency_recv() 2015-11-18 16:17:40 -05:00
en_main.c net/mlx4_en: Fix HW timestamp init issue upon system startup 2015-12-18 14:48:04 -05:00
en_netdev.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-02-23 00:09:14 -05:00
en_port.c net/mlx4_en: Count HW buffer overrun only once 2016-02-17 10:29:25 -05:00
en_port.h net/mlx4_en: Use PTYS register to query ethtool settings 2014-10-28 17:18:00 -04:00
en_resources.c net/mlx4_core: Set UAR page size to 4KB regardless of system page size 2016-02-17 10:29:27 -05:00
en_rx.c net: move skb_mark_napi_id() into core networking stack 2015-11-18 16:17:41 -05:00
en_selftest.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-03-03 21:16:48 -05:00
en_tx.c net/mlx4_core: Set UAR page size to 4KB regardless of system page size 2016-02-17 10:29:27 -05:00
eq.c net/mlx4_core: Set UAR page size to 4KB regardless of system page size 2016-02-17 10:29:27 -05:00
fw_qos.c net/mlx4: Add mlx4_SET_VPORT_QOS implementation 2015-04-02 16:25:02 -04:00
fw_qos.h net/mlx4: Added qos_vport QP configuration in VST mode 2015-04-02 16:25:03 -04:00
fw.c Initial roundup of 4.5 merge window patches 2016-01-23 18:45:06 -08:00
fw.h net/mlx4_core: Use both physical ports to set the VF link state 2015-12-06 22:40:44 -05:00
icm.c net/mlx4_core: Maintain a persistent memory for mlx4 device 2015-01-25 14:43:13 -08:00
icm.h mlx4_core: Fix GFP flags parameters to be gfp_t 2014-06-04 10:19:13 -07:00
intf.c net/mlx4: Postpone the registration of net_device 2015-08-30 18:12:20 -04:00
Kconfig net/mlx4: Set proper build dependancy with vxlan 2014-04-01 16:25:51 -04:00
main.c net/mlx4_core: Set UAR page size to 4KB regardless of system page size 2016-02-17 10:29:27 -05:00
Makefile net/mlx4: New file for QoS related firmware commands 2015-04-02 16:25:02 -04:00
mcg.c net/mlx4: Handle return codes in mlx4_qp_attach_common 2015-09-29 21:14:01 -07:00
mlx4_en.h mlx4: remove mlx4_en_low_latency_recv() 2015-11-18 16:17:40 -05:00
mlx4_stats.h net/mlx4_en: Fix off-by-four in ethtool 2015-06-24 00:42:32 -07:00
mlx4.h Initial roundup of 4.5 merge window patches 2016-01-23 18:45:06 -08:00
mr.c mlx4: corretly check failed allocation 2015-10-15 23:31:38 -07:00
pd.c net/mlx4_core: Set UAR page size to 4KB regardless of system page size 2016-02-17 10:29:27 -05:00
port.c Initial roundup of 4.5 merge window patches 2016-01-23 18:45:06 -08:00
profile.c net/mlx4_core: use swap() in mlx4_make_profile() 2015-06-11 15:19:41 -07:00
qp.c net/mlx4_core: Add support for RoCE v2 entropy 2016-01-19 15:35:00 -05:00
reset.c net/mlx4_core: Maintain a persistent memory for mlx4 device 2015-01-25 14:43:13 -08:00
resource_tracker.c net/mlx4_core: Fix potential corruption in counters database 2016-02-17 10:29:26 -05:00
sense.c
srq.c IB/mlx4: Implement IB_QP_CREATE_USE_GFP_NOIO 2014-06-02 14:58:11 -07:00