Merge branch 'mlx5_packet_pacing' into rdma.git for-next
authorJason Gunthorpe <jgg@mellanox.com>
Tue, 10 Mar 2020 14:54:17 +0000 (11:54 -0300)
committerJason Gunthorpe <jgg@mellanox.com>
Tue, 10 Mar 2020 14:54:17 +0000 (11:54 -0300)
Yishai Hadas Says:

====================
Expose raw packet pacing APIs to be used by DEVX based applications.  The
existing code was refactored to have a single flow with the new raw APIs.
====================

Based on the mlx5-next branch at
 git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Due to dependencies

* branch 'mlx5_packet_pacing':
  IB/mlx5: Introduce UAPIs to manage packet pacing
  net/mlx5: Expose raw packet pacing APIs

1  2 
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/mlx5/mlx5_ib.h
include/linux/mlx5/mlx5_ifc.h

Simple merge
Simple merge
Simple merge