Merge branch 'vhca-tunnel' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Mon, 8 Jul 2019 16:48:55 +0000 (13:48 -0300)
committerJason Gunthorpe <jgg@mellanox.com>
Mon, 8 Jul 2019 16:48:55 +0000 (13:48 -0300)
commit20893d9da7af01f9202fa78782a178004eab420d
tree7554c9427a88af61d59ffb6a2b6b7f9f66c0c716
parentf10ff380fd7dfba4a36d40f8dd00fe17da8a1a10
parentb6142608e8069dda26398e65b0a14eda6ca4282d
Merge branch 'vhca-tunnel' into rdma.git for-next

Max Gurtovoy says:

====================
Those two patches introduce VHCA tunnel mechanism to DEVX interface
needed for Bluefield SOC. See extensive commit messages for more
information.
====================

Based on the mlx5-next branch from
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux for
dependencies

* branch 'vcha-tunnel':
  IB/mlx5: Implement VHCA tunnel mechanism in DEVX
  net/mlx5: Introduce VHCA tunnel device capability
drivers/infiniband/hw/mlx5/devx.c