Merge branch 'mlx5-next into rdma.git for-next

Browse source

From
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

For dependencies needed in the next ODP patches.

* branch 'mlx5-next':
  net/mlx5: Set ODP SRQ support in firmware
  net/mlx5: Add XRC transport to ODP device capabilities layout

...

This commit is contained in:

Jason Gunthorpe 2019-02-04 14:33:02 -07:00

parent da91ddfdc7 46861e3e88

commit e431a80a54

3 changed files with 60 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

53

drivers/net/ethernet/mellanox/mlx5/core/main.c

View file

3

include/linux/mlx5/device.h

View file

5

include/linux/mlx5/mlx5_ifc.h

View file