leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ed3d2276ef
linux/drivers/net/ethernet/mellanox/mlx5/core
History
David S. Miller dda922c831 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/phy/amd-xgbe-phy.c
	drivers/net/wireless/iwlwifi/Kconfig
	include/net/mac80211.h

iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.

The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-01 22:51:30 -07:00
..
alloc.c net/mlx5_core,mlx5_ib: Do not use vmap() on coherent memory 2015-05-30 18:22:37 -07:00
cmd.c net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality 2015-05-30 18:24:51 -07:00
cq.c net/mlx5_core: Modify CQ moderation parameters 2015-05-30 18:23:59 -07:00
debugfs.c net/mlx5_core: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
en_ethtool.c net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality 2015-05-30 18:24:51 -07:00
en_flow_table.c net/mlx5: Ethernet resource handling files 2015-05-30 18:24:39 -07:00
en_main.c net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality 2015-05-30 18:24:51 -07:00
en_rx.c net/mlx5: Ethernet Datapath files 2015-05-30 18:24:20 -07:00
en_tx.c net/mlx5: Ethernet Datapath files 2015-05-30 18:24:20 -07:00
en_txrx.c net/mlx5: Ethernet Datapath files 2015-05-30 18:24:20 -07:00
en.h net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality 2015-05-30 18:24:51 -07:00
eq.c net/mlx5_core: New device capabilities handling 2015-05-30 18:23:22 -07:00
flow_table.c net/mlx5: Ethernet resource handling files 2015-05-30 18:24:39 -07:00
fw.c net/mlx5_core: New device capabilities handling 2015-05-30 18:23:22 -07:00
health.c net/mlx5_core: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
Kconfig net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality 2015-05-30 18:24:51 -07:00
mad.c net/mlx5_core: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-06-01 22:51:30 -07:00
Makefile net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality 2015-05-30 18:24:51 -07:00
mcg.c net/mlx5_core: HW data structs/types definitions cleanup 2015-05-30 18:23:11 -07:00
mlx5_core.h net/mlx5: Extend mlx5_core to support ConnectX-4 Ethernet functionality 2015-05-30 18:24:51 -07:00
mr.c net/mlx5_core: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
pagealloc.c mlx5: wrong page mask if CONFIG_ARCH_DMA_ADDR_T_64BIT enabled for 32Bit architectures 2015-04-15 16:20:51 -04:00
pd.c net/mlx5_core: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
port.c net/mlx5_core: Set/Query port MTU commands 2015-05-30 18:24:08 -07:00
qp.c net/mlx5_core: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
srq.c net/mlx5_core: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
transobj.c net/mlx5: Ethernet resource handling files 2015-05-30 18:24:39 -07:00
transobj.h net/mlx5: Ethernet resource handling files 2015-05-30 18:24:39 -07:00
uar.c net/mlx5_core: New device capabilities handling 2015-05-30 18:23:22 -07:00
vport.c net/mlx5: Ethernet resource handling files 2015-05-30 18:24:39 -07:00
vport.h net/mlx5: Ethernet resource handling files 2015-05-30 18:24:39 -07:00
wq.c net/mlx5: Ethernet Datapath files 2015-05-30 18:24:20 -07:00
wq.h net/mlx5: Ethernet Datapath files 2015-05-30 18:24:20 -07:00