David S. Miller 3a3f7d130e Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Some overlapping changes in the mlx5 driver.

A merge conflict resolution posted by Stephen Rothwell was used as a
guide.

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

2017-07-03 03:42:10 -07:00

..

cmd.h

…

cq.h

…

device.h

net/mlx5: FPGA, Add SBU infrastructure

2017-06-27 16:36:47 +03:00

doorbell.h

…

driver.h

Merge https://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-07-03 03:42:10 -07:00

fs.h

…

mlx5_ifc_fpga.h

net/mlx5: Accel, Add IPSec acceleration interface

2017-06-27 16:36:47 +03:00

mlx5_ifc.h

net/mlx5e: IPSec, Innova IPSec offload infrastructure

2017-06-27 16:36:47 +03:00

port.h

net/mlx5e: Add support for reading connector type from PTYS

2017-06-08 14:12:00 +03:00

qp.h

net/mlx5e: IPSec, Innova IPSec offload infrastructure

2017-06-27 16:36:47 +03:00

srq.h

…

transobj.h

…

vport.h

…