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

diff --cc drivers/infiniband/hw/mlx5/qp.c
Simple merge

diff --cc include/linux/mlx5/mlx5_ifc.h
Simple merge