]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'mlx5-vport-loopback' into rdma.get
authorDoug Ledford <dledford@redhat.com>
Sat, 22 Sep 2018 00:41:58 +0000 (20:41 -0400)
committerDoug Ledford <dledford@redhat.com>
Sat, 22 Sep 2018 00:41:58 +0000 (20:41 -0400)
commit714cb854e5ea94b0101fc3658c8ba109c2b5564f
treed18c97591154d276010e9ae9c0b7d5a9409393c8
parente15fc01628c51d3fc0eb63bcfad743aa2f30ec28
parent7e8405b2b76c746a0e72aac5ac510a5b218a438f
Merge branch 'mlx5-vport-loopback' into rdma.get

For dependencies, branch based on 'mlx5-next' of
    git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git

mlx5 mcast/ucast loopback control enhancements from Leon Romanovsky:

====================
This is short series from Mark which extends handling of loopback
traffic. Originally mlx5 IB dynamically enabled/disabled both unicast
and multicast based on number of users. However RAW ethernet QPs need
more granular access.
====================

Fixed failed automerge in mlx5_ib.h (minor context conflict issue)

mlx5-vport-loopback branch:
    RDMA/mlx5: Enable vport loopback when user context or QP mandate
    RDMA/mlx5: Allow creating RAW ethernet QP with loopback support
    RDMA/mlx5: Refactor transport domain bookkeeping logic
    net/mlx5: Rename incorrect naming in IFC file

Signed-off-by: Doug Ledford <dledford@redhat.com>
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
drivers/infiniband/hw/mlx5/qp.c