OSDN Git Service

Merge branch 'mellanox/mlx5-next' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Tue, 25 Sep 2018 20:02:48 +0000 (14:02 -0600)
committerJason Gunthorpe <jgg@mellanox.com>
Tue, 25 Sep 2018 20:02:48 +0000 (14:02 -0600)
commit1d6fba92d7325cfc96ff52c3335b63bb6326abf5
treee6087758be73e876f0f4cdacb00039a5b28eb5fa
parentf9882bb5060b956a22c4ce6d477f9860128c0f08
parentbd37197554eb28a7fc38e44e005e303c77f788ed
Merge branch 'mellanox/mlx5-next' into rdma.git for-next

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

This is required to resolve dependencies of the next series of RDMA
patches.

* branch 'mellanox/mlx5-next':
  net/mlx5: Update mlx5_ifc with DEVX UID bits
  net/mlx5: Set uid as part of DCT commands
  net/mlx5: Set uid as part of SRQ commands
  net/mlx5: Set uid as part of SQ commands
  net/mlx5: Set uid as part of RQ commands
  net/mlx5: Set uid as part of QP commands
  net/mlx5: Set uid as part of CQ commands

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>