OSDN Git Service

Merge remote-tracking branch 'mlx5-next/mlx5-next' into for-next
authorDoug Ledford <dledford@redhat.com>
Mon, 26 Aug 2019 14:28:05 +0000 (10:28 -0400)
committerDoug Ledford <dledford@redhat.com>
Mon, 26 Aug 2019 14:28:05 +0000 (10:28 -0400)
Bring in the lastest mlx5-next branch as the RDMA RX RoCE Steering
Support patch series requires it (first two patches are in mlx5-next,
final patch in RDMA tree).

Signed-off-by: Doug Ledford <dledford@redhat.com>
1  2 
drivers/net/ethernet/mellanox/mlx5/core/fs_core.h
include/linux/mlx5/fs.h
include/linux/mlx5/mlx5_ifc.h

Simple merge
Simple merge