Merge branch 'mellanox/mlx5-next' into rdma.git for/next
authorJason Gunthorpe <jgg@mellanox.com>
Wed, 13 May 2020 18:54:19 +0000 (15:54 -0300)
committerJason Gunthorpe <jgg@mellanox.com>
Wed, 13 May 2020 18:54:19 +0000 (15:54 -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 support in forward to namespace
  {IB/net}/mlx5: Simplify don't trap code
  net/mlx5: Replace zero-length array with flexible-array

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
1  2 
drivers/infiniband/hw/mlx5/main.c
include/linux/mlx5/mlx5_ifc.h
include/linux/mlx5/qp.h

Simple merge
Simple merge
Simple merge