From: Jason Gunthorpe <jgg@mellanox.com>
Date: Mon, 4 Feb 2019 21:33:02 +0000 (-0700)
Subject: Merge branch 'mlx5-next into rdma.git for-next
X-Git-Tag: v5.1-rc1~86^2~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e431a80a540960a10bd7de9e866776ba6f0612e6;p=thirdparty%2Fkernel%2Flinux.git

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

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
---

e431a80a540960a10bd7de9e866776ba6f0612e6