Merge branch 'mlx5_tx_steering' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Fri, 27 Mar 2020 16:26:59 +0000 (13:26 -0300)
committerJason Gunthorpe <jgg@mellanox.com>
Fri, 27 Mar 2020 16:26:59 +0000 (13:26 -0300)
commitdbdf8909d03d8ab23dc7a6d6edce0791d6a9055c
tree68839455b62c1e4b079b02f2696bc839ca0f6aa5
parentdfb5394f804ed4fcea1fc925be275a38d66712ab
parentaf9c38411d188021900031d00bd8e8dafd4ad557
Merge branch 'mlx5_tx_steering' into rdma.git for-next

Leon Romanovsky says:

====================
Those two patches from Michael extends mlx5_core and mlx5_ib flow steering
to support RDMA TX in similar way to already supported RDMA RX.
====================

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

* branch 'mlx5_tx_steering':
  RDMA/mlx5: Add support for RDMA TX flow table
  net/mlx5: Add support for RDMA TX steering
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
include/linux/mlx5/mlx5_ifc.h
include/uapi/rdma/mlx5_user_ioctl_verbs.h