diff options
author | Jason Gunthorpe <jgg@mellanox.com> | 2019-07-05 10:16:19 -0300 |
---|---|---|
committer | Jason Gunthorpe <jgg@mellanox.com> | 2019-07-05 10:16:19 -0300 |
commit | 5600a410ea24cb8467abdd4b8530961ff4f14907 (patch) | |
tree | 572b909f0c6cf4985e1d063f897e371ea0162995 /include/rdma/restrack.h | |
parent | RDMA/efa: Entropy in admin commands id (diff) | |
parent | net/mlx5: Add rts2rts_qp_counters_set_id field in hca cap (diff) | |
download | linux-dev-5600a410ea24cb8467abdd4b8530961ff4f14907.tar.xz linux-dev-5600a410ea24cb8467abdd4b8530961ff4f14907.zip |
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()
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions