David S. Miller 446bf64b61 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Merge conflict of mlx5 resolved using instructions in merge
commit 9566e650bf.

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

2019-08-19 11:54:03 -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

net/mlx5: kTLS, Fix wrong TIS opmod constants

2019-08-08 13:01:19 -07:00

doorbell.h

…

driver.h

mlx5: no need to check return value of debugfs_create functions

2019-08-10 15:25:47 -07:00

eq.h

net/mlx5: Use event mask based on device capabilities

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

eswitch.h

net/mlx5: E-switch, Removed unused hwid

2019-08-09 14:54:10 -07:00

fs_helpers.h

…

fs.h

net/mlx5e: Protect mod_hdr hash table with mutex

2019-08-09 14:54:09 -07:00

mlx5_ifc_fpga.h

…

mlx5_ifc.h

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

2019-08-19 11:54:03 -07:00

port.h

net/mlx5e: ethtool, Add support for EEPROM high pages query

2019-05-01 14:39:16 -07:00

qp.h

IB/mlx5: Support set qp counter

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

transobj.h

net/mlx5: Introduce new TIR creation core API

2019-04-24 12:33:37 -07:00

vport.h

net/mlx5: Introduce and use mlx5_eswitch_get_total_vports()

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