Merge branch 'mlx_sw_owner_v2' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Fri, 18 Sep 2020 12:42:21 +0000 (09:42 -0300)
committerJason Gunthorpe <jgg@nvidia.com>
Fri, 18 Sep 2020 13:31:45 +0000 (10:31 -0300)
Leon Romanovsky says:

====================
This series from Alex extends software steering interface to support
devices with extra capability "sw_owner_2" which will replace existing
"sw_owner".
====================

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

* branch 'mlx5_sw_owner_v2:
  RDMA/mlx5: Expose TIR and QP ICM address for sw_owner_v2 devices
  RDMA/mlx5: Allow DM allocation for sw_owner_v2 enabled devices
  RDMA/mlx5: Add sw_owner_v2 bit capability

1  2 
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/qp.c
include/linux/mlx5/mlx5_ifc.h

Simple merge
Simple merge
Simple merge