Merge branch 'mellanox/mlx5-next' into rdma.git for/next
authorJason Gunthorpe <jgg@mellanox.com>
Wed, 27 May 2020 19:01:17 +0000 (16:01 -0300)
committerJason Gunthorpe <jgg@mellanox.com>
Wed, 27 May 2020 19:01:17 +0000 (16:01 -0300)
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>
1  2 
drivers/infiniband/hw/mlx5/flow.c
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
include/linux/mlx5/mlx5_ifc.h

Simple merge
Simple merge