leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9365fbf578
linux/drivers/net/ethernet/mellanox/mlx5/core
History
David S. Miller 1de1d449c6 mlx5: Fix merge errors. 
I accidently let Arnd's VXLAN dependency changes slip into net-next,
they are only appropriate for net.

Also the flow steering structural changes to mlx5e_priv got scrambled
during the merge resolution as well.

Fix that all up.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-09 22:05:13 -04:00
..
alloc.c net/mlx5e: Allocate DMA coherent memory on reader NUMA node 2015-07-27 00:29:17 -07:00
cmd.c Round two of 4.6 merge window patches 2016-03-22 15:48:44 -07:00
cq.c net/mlx5_core: New init and exit flow for mlx5_core 2015-09-28 22:19:50 -07:00
debugfs.c net/mlx5_core: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
en_arfs.c net/mlx5e: Fix aRFS compilation dependency 2016-05-04 14:04:46 -04:00
en_clock.c net/mlx5e: Fix soft lockup when HW Timestamping is enabled 2016-03-02 14:37:25 -05:00
en_dcbnl.c net/mlx5e: Add per priority group to PPort counters 2016-04-26 15:58:01 -04:00
en_ethtool.c net/mlx5e: Enabling aRFS mechanism 2016-04-29 16:29:12 -04:00
en_fs.c net/mlx5e: Create aRFS flow tables 2016-04-29 16:29:11 -04:00
en_main.c mlx5: Fix merge errors. 2016-05-09 22:05:13 -04:00
en_rx.c net/mlx5e: Fix checksum handling for non-stripped vlan packets 2016-04-26 15:58:03 -04:00
en_stats.h net/mlx5e: Fix checksum handling for non-stripped vlan packets 2016-04-26 15:58:03 -04:00
en_tc.c net/mlx5e: Refactor mlx5e flow steering structs 2016-04-29 16:29:10 -04:00
en_tc.h net/mlx5e: Refactor mlx5e flow steering structs 2016-04-29 16:29:10 -04:00
en_tx.c net/mlx5e: Add fragmented memory support for RX multi packet WQE 2016-04-21 15:09:05 -04:00
en_txrx.c net/mlx5e: Remove redundant barrier 2016-04-21 15:09:05 -04:00
en.h mlx5: Fix merge errors. 2016-05-09 22:05:13 -04:00
eq.c net/mlx5e: Replace async events spinlock with synchronize_irq() 2016-03-01 17:27:58 -05:00
eswitch.c net/mlx5: E-Switch, Implement trust vf ndo 2016-05-04 14:04:49 -04:00
eswitch.h net/mlx5: E-Switch, Implement trust vf ndo 2016-05-04 14:04:49 -04:00
fs_cmd.c net/mlx5: Flow steering, Add vport ACL support 2016-05-04 14:04:46 -04:00
fs_cmd.h net/mlx5: Flow steering, Add vport ACL support 2016-05-04 14:04:46 -04:00
fs_core.c net/mlx5: Flow steering, Add vport ACL support 2016-05-04 14:04:46 -04:00
fs_core.h net/mlx5: Flow steering, Add vport ACL support 2016-05-04 14:04:46 -04:00
fw.c net/mlx5_core: Introduce offload arithmetic hardware capabilities 2016-03-21 16:32:35 -04:00
health.c net/mlx5_core: Add pci error handlers to mlx5_core driver 2015-10-14 19:14:42 -07:00
Kconfig mlx5: Fix merge errors. 2016-05-09 22:05:13 -04:00
mad.c IB/core cleanup: Add const on args - device->process_mad 2015-06-02 09:33:13 -04:00
main.c net/mlx5: Initializing CPU reverse mapping 2016-04-29 16:29:11 -04:00
Makefile mlx5: Fix merge errors. 2016-05-09 22:05:13 -04: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: Flow steering, Add vport ACL support 2016-05-04 14:04:46 -04:00
mr.c net/mlx5: Refactor mlx5_core_mr to mkey 2016-03-01 11:18:37 -05:00
pagealloc.c net/mlx5_core: Add base sriov support 2015-12-03 12:08:43 -05:00
pd.c net/mlx5_core: Fix Mellanox copyright note 2015-04-02 16:33:42 -04:00
port.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2016-04-27 15:43:10 -04:00
qp.c net/mlx5: Introduce device queue counters 2016-04-21 15:09:04 -04:00
sriov.c net/mlx5: E-Switch, Add SR-IOV (FDB) support 2015-12-03 12:08:46 -05:00
srq.c net/mlx5_core: Export transport objects 2016-01-21 12:01:08 -05:00
transobj.c IB/mlx5: Support setting Ethernet priority for Raw Packet QPs 2016-01-21 12:01:09 -05:00
uar.c net/mlx5: Unmap only the relevant IO memory mapping 2016-05-03 13:37:25 -04:00
vport.c net/mlx5e: Use vport MTU rather than physical port MTU 2016-04-24 14:51:39 -04:00
vxlan.c net/mlx5e: Use workqueue for vxlan ops 2016-05-03 13:37:26 -04:00
vxlan.h mlx5: Fix merge errors. 2016-05-09 22:05:13 -04:00
wq.c net/mlx5e: Allocate DMA coherent memory on reader NUMA node 2015-07-27 00:29:17 -07:00
wq.h net/mlx5e: Allocate DMA coherent memory on reader NUMA node 2015-07-27 00:29:17 -07:00