Merge mlx5-next into rdma for-next
authorJason Gunthorpe <jgg@mellanox.com>
Fri, 5 Jul 2019 13:16:19 +0000 (10:16 -0300)
committerJason Gunthorpe <jgg@mellanox.com>
Fri, 5 Jul 2019 13:16:19 +0000 (10:16 -0300)
commit5600a410ea24cb8467abdd4b8530961ff4f14907
tree572b909f0c6cf4985e1d063f897e371ea0162995
parentbcde9a83b13ede042fd76e4cf0b759b6d6c0abe9
parentf8efee08dd9d41ab71010e9b16c9ead51753b7d6
Merge mlx5-next into rdma for-next

From git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

Required for dependencies in the next patches.

* mlx5-next:
  net/mlx5: Add rts2rts_qp_counters_set_id field in hca cap
  net/mlx5: Properly name the generic WQE control field
  net/mlx5: Introduce TLS TX offload hardware bits and structures
  net/mlx5: Refactor mlx5_esw_query_functions for modularity
  net/mlx5: E-Switch prepare functions change handler to be modular
  net/mlx5: Introduce and use mlx5_eswitch_get_total_vports()
drivers/infiniband/hw/mlx5/ib_rep.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c
include/linux/mlx5/eswitch.h
include/linux/mlx5/qp.h