Merge branch 'mlx5-next' into rdma.git for-next
From git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux To resolve conflicts with net-next and pick up the first patch. * branch 'mlx5-next': net/mlx5: Factor out HCA capabilities functions IB/mlx5: Add support for 50Gbps per lane link modes net/mlx5: Add support to ext_* fields introduced in Port Type and Speed register net/mlx5: Add new fields to Port Type and Speed register net/mlx5: Refactor queries to speed fields in Port Type and Speed register net/mlx5: E-Switch, Avoid magic numbers when initializing offloads mode net/mlx5: Relocate vport macros to the vport header file net/mlx5: E-Switch, Normalize the name of uplink vport number net/mlx5: Provide an alternative VF upper bound for ECPF net/mlx5: Add host params change event net/mlx5: Add query host params command net/mlx5: Update enable HCA dependency net/mlx5: Introduce Mellanox SmartNIC and modify page management logic IB/mlx5: Use unified register/load function for uplink and VF vports net/mlx5: Use consistent vport num argument type net/mlx5: Use void pointer as the type in address_of macro net/mlx5: Align ODP capability function with netdev coding style mlx5: use RCU lock in mlx5_eq_cq_get() Signed-off-by:Jason Gunthorpe <jgg@mellanox.com>
No related branches found
No related tags found
Showing
- drivers/infiniband/hw/mlx5/ib_rep.c 18 additions, 55 deletionsdrivers/infiniband/hw/mlx5/ib_rep.c
- drivers/infiniband/hw/mlx5/ib_rep.h 6 additions, 4 deletionsdrivers/infiniband/hw/mlx5/ib_rep.h
- drivers/infiniband/hw/mlx5/main.c 77 additions, 18 deletionsdrivers/infiniband/hw/mlx5/main.c
- drivers/net/ethernet/mellanox/mlx5/core/Makefile 1 addition, 1 deletiondrivers/net/ethernet/mellanox/mlx5/core/Makefile
- drivers/net/ethernet/mellanox/mlx5/core/cmd.c 2 additions, 0 deletionsdrivers/net/ethernet/mellanox/mlx5/core/cmd.c
- drivers/net/ethernet/mellanox/mlx5/core/ecpf.c 112 additions, 0 deletionsdrivers/net/ethernet/mellanox/mlx5/core/ecpf.c
- drivers/net/ethernet/mellanox/mlx5/core/ecpf.h 33 additions, 0 deletionsdrivers/net/ethernet/mellanox/mlx5/core/ecpf.h
- drivers/net/ethernet/mellanox/mlx5/core/en/port.c 122 additions, 20 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en/port.c
- drivers/net/ethernet/mellanox/mlx5/core/en/port.h 14 additions, 2 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en/port.h
- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c 11 additions, 17 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c 12 additions, 12 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en_rep.c
- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c 3 additions, 3 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en_tc.c
- drivers/net/ethernet/mellanox/mlx5/core/eq.c 10 additions, 6 deletionsdrivers/net/ethernet/mellanox/mlx5/core/eq.c
- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c 20 additions, 22 deletionsdrivers/net/ethernet/mellanox/mlx5/core/eswitch.c
- drivers/net/ethernet/mellanox/mlx5/core/eswitch.h 0 additions, 2 deletionsdrivers/net/ethernet/mellanox/mlx5/core/eswitch.h
- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c 22 additions, 17 deletionsdrivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
- drivers/net/ethernet/mellanox/mlx5/core/events.c 2 additions, 0 deletionsdrivers/net/ethernet/mellanox/mlx5/core/events.c
- drivers/net/ethernet/mellanox/mlx5/core/fs_core.c 1 addition, 0 deletionsdrivers/net/ethernet/mellanox/mlx5/core/fs_core.c
- drivers/net/ethernet/mellanox/mlx5/core/main.c 53 additions, 24 deletionsdrivers/net/ethernet/mellanox/mlx5/core/main.c
- drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h 1 addition, 1 deletiondrivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h
Loading
Please register or sign in to comment