Jakub Kicinski 55fd59b003 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/ethernet/ibm/ibmvnic.c Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2020-12-03 15:44:09 -08:00
..
accel.h	net/mlx5: Accel, Add core IPsec support for the Connect-X family	2020-07-16 16:36:42 -07:00
cq.h	net/mlx5: Avoid RDMA file inclusion in core driver	2020-06-27 13:50:46 -07:00
device.h	net/mlx5: Update the hardware interface definition for vhca state	2020-11-26 18:43:48 -08:00
doorbell.h	net/mlx5: Remove spinlock support from mlx5_write64	2019-04-02 12:49:37 -07:00
driver.h	mlx5-next-2020-12-02	2020-12-02 17:29:23 -08: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, Use PF num in metadata reg c0	2020-09-30 21:26:28 -07:00
fs.h	net/mlx5: Treat host PF vport as other (non eswitch manager) vport	2020-11-26 18:45:03 -08:00
fs_helpers.h	{net,IB}/mlx5: Add ipsec helper	2018-04-04 12:06:27 -06:00
mlx5_ifc.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2020-12-03 15:44:09 -08:00
mlx5_ifc_fpga.h	net/mlx5: fix spelling mistake "reserverd" -> "reserved"	2020-02-18 15:44:07 +02:00
port.h	RDMA/mlx5: Delete duplicated mlx5_ptys_width enum	2020-09-17 19:33:03 +03:00
qp.h	net/mlx5e: IPsec: Add TX steering rule per IPsec state	2020-10-12 15:37:45 -07:00
rsc_dump.h	net/mlx5: Add support in query QP, CQ and MKEY segments	2020-06-23 17:26:10 +03:00
transobj.h	net/mlx5: Update transobj.c new cmd interface	2020-04-23 21:42:16 +03:00
vport.h	net/mlx5: Constify mac address pointer	2020-06-22 15:29:19 -07:00