Merge branch 'mlx5_timestamp' into rdma.git for-next
authorJason Gunthorpe <jgg@nvidia.com>
Tue, 16 Feb 2021 18:49:36 +0000 (14:49 -0400)
committerJason Gunthorpe <jgg@nvidia.com>
Tue, 16 Feb 2021 18:49:36 +0000 (14:49 -0400)
commit68ad4d1cc679c1704faf9db6ddd0550702b5d093
tree3965830fccf13ba0cf575262951e80f79a5333e9
parent7232c132d13aafd178ba18c1099b2cb98d104b8c
parent2fe8d4b87802dcde7fa015229c84bb726f631b4d
Merge branch 'mlx5_timestamp' into rdma.git for-next

Leon Romanovsky says:

====================
Add an extra timestamp format for mlx5_ib device.
====================

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

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
* branch 'mlx5_timestamp':
  RDMA/mlx5: Fail QP creation if the device can not support the CQE TS
  net/mlx5: Add new timestamp mode bits
drivers/infiniband/hw/mlx5/qp.c
include/linux/mlx5/mlx5_ifc.h