Merge branch 'mlx5_uar' into rdma.git /for-next
authorJason Gunthorpe <jgg@nvidia.com>
Mon, 27 Jul 2020 14:44:36 +0000 (11:44 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Mon, 27 Jul 2020 14:44:36 +0000 (11:44 -0300)
commit79237743687178a56b282e6a8b9845ab0a54e598
treed85a63da78278f7d986545338eb0bdf6b7104790
parent8b603d0715a372f5827d3a6b19d9568bf854b687
parent896ec9735336f5adb576d372ed7e411bce2fc74c
Merge branch 'mlx5_uar' into rdma.git /for-next

Meir Lichtinger says:

====================
ConnectX-7 supports setting relaxed ordering read/write mkey attribute by
UMR, indicated by new HCA capabilities, so extend mlx5_ib driver to
configure UMR control segment
====================

Based on the mlx5-next branch at
      git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
due to dependencies.

* branch 'mlx5_uar':
  RDMA/mlx5: Set mkey relaxed ordering by UMR with ConnectX-7
  RDMA/mlx5: Use MLX5_SET macro instead of local structure
  RDMA/mlx5: ConnectX-7 new capabilities to set relaxed ordering by UMR
drivers/infiniband/hw/mlx5/mlx5_ib.h