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

…

cq.h

…

device.h

…

doorbell.h

…

driver.h

Merge tag 'mlx5-next-2020-12-02' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

2020-12-02 17:29:23 -08:00

eq.h

…

eswitch.h

…

fs_helpers.h

…

fs.h

net/mlx5: Treat host PF vport as other (non eswitch manager) vport

2020-11-26 18:45:03 -08:00

mlx5_ifc_fpga.h

…

mlx5_ifc.h

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

2020-12-03 15:44:09 -08:00

port.h

…

qp.h

…

rsc_dump.h

…

transobj.h

…

vport.h

…