Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
mlx5-next shared branch with rdma subtree to avoid mlx5 rdma v.s. netdev
conflicts.
Highlights:
1) RDMA ODP (On Demand Paging) improvements and moving ODP logic to
mlx5 RDMA driver
2) Improved mlx5 core driver and device events handling and provided API
for upper layers to subscribe to device events.
3) RDMA only code cleanup from mlx5 core
4) Add helper to get CQE opcode
5) Rework handling of port module events
6) shared mlx5_ifc.h updates to avoid conflicts
Signed-off-by:
Saeed Mahameed <saeedm@mellanox.com>
No related branches found
No related tags found
Showing
- drivers/infiniband/core/umem_odp.c 12 additions, 2 deletionsdrivers/infiniband/core/umem_odp.c
- drivers/infiniband/hw/mlx5/Makefile 3 additions, 1 deletiondrivers/infiniband/hw/mlx5/Makefile
- drivers/infiniband/hw/mlx5/cq.c 6 additions, 6 deletionsdrivers/infiniband/hw/mlx5/cq.c
- drivers/infiniband/hw/mlx5/ib_rep.c 4 additions, 0 deletionsdrivers/infiniband/hw/mlx5/ib_rep.c
- drivers/infiniband/hw/mlx5/main.c 165 additions, 66 deletionsdrivers/infiniband/hw/mlx5/main.c
- drivers/infiniband/hw/mlx5/mlx5_ib.h 21 additions, 3 deletionsdrivers/infiniband/hw/mlx5/mlx5_ib.h
- drivers/infiniband/hw/mlx5/odp.c 306 additions, 25 deletionsdrivers/infiniband/hw/mlx5/odp.c
- drivers/infiniband/hw/mlx5/srq.c 9 additions, 40 deletionsdrivers/infiniband/hw/mlx5/srq.c
- drivers/infiniband/hw/mlx5/srq.h 73 additions, 0 deletionsdrivers/infiniband/hw/mlx5/srq.h
- drivers/infiniband/hw/mlx5/srq_cmd.c 154 additions, 148 deletionsdrivers/infiniband/hw/mlx5/srq_cmd.c
- drivers/net/ethernet/mellanox/mlx5/core/Makefile 2 additions, 2 deletionsdrivers/net/ethernet/mellanox/mlx5/core/Makefile
- drivers/net/ethernet/mellanox/mlx5/core/cmd.c 51 additions, 3 deletionsdrivers/net/ethernet/mellanox/mlx5/core/cmd.c
- drivers/net/ethernet/mellanox/mlx5/core/cq.c 8 additions, 7 deletionsdrivers/net/ethernet/mellanox/mlx5/core/cq.c
- drivers/net/ethernet/mellanox/mlx5/core/debugfs.c 11 additions, 0 deletionsdrivers/net/ethernet/mellanox/mlx5/core/debugfs.c
- drivers/net/ethernet/mellanox/mlx5/core/dev.c 4 additions, 158 deletionsdrivers/net/ethernet/mellanox/mlx5/core/dev.c
- drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c 4 additions, 4 deletionsdrivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c
- drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c 15 additions, 12 deletionsdrivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
- drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.h 1 addition, 1 deletiondrivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.h
- drivers/net/ethernet/mellanox/mlx5/core/en.h 3 additions, 3 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en.h
- drivers/net/ethernet/mellanox/mlx5/core/en_main.c 20 additions, 31 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en_main.c
Loading
Please register or sign in to comment