David S. Miller f83f715195 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Minor comment merge conflict in mlx5.

Staging driver has a fixup due to the skb->xmit_more changes
in 'net-next', but was removed in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-04-05 14:14:19 -07:00

..

accel.h

…

cmd.h

…

cq.h

net/mlx5e: Use CQE padding for Ethernet CQs

2018-12-11 14:52:20 -08:00

device.h

net/mlx5: Add host params change event

2019-02-14 12:14:42 -08:00

doorbell.h

…

driver.h

net/mlx5e: Add a lock on tir list

2019-03-29 12:24:41 -07:00

eq.h

…

eswitch.h

net/mlx5: E-Switch, Centralize repersentor reg/unreg to eswitch driver

2019-02-15 17:25:58 -08:00

fs_helpers.h

…

fs.h

net/mlx5: Support extended destination format in flow steering command

2018-12-10 14:00:08 -08:00

mlx5_ifc_fpga.h

…

mlx5_ifc.h

net/mlx5e: Add VLAN ID rewrite fields

2019-03-22 12:09:32 -07:00

port.h

net/mlx5e: Fix GRE key by controlling port tunnel entropy calculation

2019-02-22 13:38:23 -08:00

qp.h

IB/mlx5: Use mlx5 core to create/destroy a DEVX DCT

2019-03-17 21:40:39 -03:00

transobj.h

net/mlx5: Move SRQ functions to RDMA part

2018-12-04 09:14:30 +02:00

vport.h

net/mlx5: E-Switch, Consider ECPF vport depends on eswitch ownership

2019-02-15 17:25:58 -08:00