git.ipfire.org Git - thirdparty/kernel/linux.git/commit

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>

author	Jason Gunthorpe <jgg@mellanox.com>
	Wed, 27 May 2020 19:01:17 +0000 (16:01 -0300)
committer	Jason Gunthorpe <jgg@mellanox.com>
	Wed, 27 May 2020 19:01:17 +0000 (16:01 -0300)
commit	e4fdf7625b68f32681240b3a43cb82b9f3555bf6
tree	b76aa29f646d5ac6d43c36fde6ec2fb6ebba7c47	tree \| snapshot
parent	d246a3061528be6d852156d25c02ea69d6db7e65	commit \| diff
parent	6b646a7e4af69814dd1a3340fca0f02d4977420d	commit \| diff

drivers/infiniband/hw/mlx5/flow.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx5/core/cmd.c	diff1 \|	diff2 \|	blob \| history
include/linux/mlx5/mlx5_ifc.h	diff1 \|	diff2 \|	blob \| history