Merge 'mlx5-next' into mlx5-devx
authorDoug Ledford <dledford@redhat.com>
Tue, 4 Dec 2018 18:36:57 +0000 (13:36 -0500)
committerDoug Ledford <dledford@redhat.com>
Tue, 4 Dec 2018 18:36:57 +0000 (13:36 -0500)
commitf33cb7e760dee94dd2b2d7a7f6225578a66a17d5
tree5c11f8c9fe861efc29307202a074ca8d06a57f49
parentffd321e4b7e4617e7fad663af0f59bb4e0c20c34
parent9d43faac02e3a4a26171f96f4de69fa650d3b6f6
Merge 'mlx5-next' into mlx5-devx

The enhanced devx support series needs commit:
9d43faac02e3 ("net/mlx5: Update mlx5_ifc with DEVX UCTX capabilities bits")

Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/hw/mlx5/srq.c