David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Just minor overlapping changes in the conflicts here.

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

2019-08-06 18:44:57 -07:00

..

accel.h

net/mlx5: Kconfig, Better organize compilation flags

2019-07-05 16:29:19 -07:00

cmd.h

…

cq.h

net/mlx5: Report EQE data upon CQ completion

2019-07-03 21:00:20 +03:00

device.h

Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

2019-07-04 16:42:59 -04:00

doorbell.h

…

driver.h

net/mlx5: Add flow counter pool

2019-08-01 12:33:30 -07:00

eq.h

net/mlx5: Use event mask based on device capabilities

2019-07-03 20:55:45 +03:00

eswitch.h

Merge mlx5-next into rdma for-next

2019-07-05 10:16:19 -03:00

fs_helpers.h

…

fs.h

net/mlx5e: Prevent encap flow counter update async to user query

2019-07-25 13:31:00 -07:00

mlx5_ifc_fpga.h

…

mlx5_ifc.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2019-08-06 18:44:57 -07:00

port.h

…

qp.h

IB/mlx5: Support set qp counter

2019-07-05 10:22:55 -03:00

transobj.h

…

vport.h

net/mlx5: Introduce and use mlx5_eswitch_get_total_vports()

2019-07-03 12:50:42 -07:00