From: Jason Gunthorpe <jgg@mellanox.com>
Date: Wed, 27 May 2020 19:01:17 +0000 (-0300)
Subject: Merge branch 'mellanox/mlx5-next' into rdma.git for/next
X-Git-Tag: v5.15~3685^2~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e4fdf7625b68f32681240b3a43cb82b9f3555bf6;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'mellanox/mlx5-next' into rdma.git for/next

From the mlx5-next branch at
  git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

Required for dependencies in following patches

* branch 'mellanox/mlx5-next':
  net/mlx5: Add ability to read and write ECE options
  net/mlx5: Add support for RDMA TX FT headers modifying
  net/mlx5: Move iseg access helper routines close to mlx5_core driver
  net/mlx5: Cleanup mlx5_ifc_fte_match_set_misc2_bits

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
---

e4fdf7625b68f32681240b3a43cb82b9f3555bf6