Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox...

Saeed Mahameed says:
====================
pull-request: mlx5-next 2021-02-16

The patches in this pr are already submitted and reviewed through the
netdev and rdma mailing lists.

The series includes mlx5 HW bits and definitions for mlx5 real time clock
translation and handling in the mlx5 driver clock module to enable and
support such mode [1]

[1] https://patchwork.kernel.org/project/netdevbpf/patch/20210212223042[email protected]/
====================

Signed-off-by: David S. Miller <[email protected]>

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
index a8e31cdd4a4eea45d022b72909eb1a039e4116e3,096e44d2ab4b10d7828c67a23da08b389439b818..7435fe6829b6bf3d8ae6e25b4a41373d47e40dc1
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en.h
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en.h
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@@ -55,8 -55,8 +55,9 @@@
  #include "en_stats.h"
  #include "en/dcbnl.h"
  #include "en/fs.h"
 +#include "en/qos.h"
  #include "lib/hv_vhca.h"
+ #include "lib/clock.h"
  
  extern const struct net_device_ops mlx5e_netdev_ops;
  struct page_pool;

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index d3534b657b980e01053fb2cdc6159629a7290f1a,e40dec25cf6bd152191bffb5e994ca6e0f7601e5..c8866c14b8a376db3355a61723e86fd8d943d810
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@@ -677,10 -653,11 +680,10 @@@ static void mlx5e_free_rq(struct mlx5e_
        mlx5_wq_destroy(&rq->wq_ctrl);
  }
  
 -static int mlx5e_create_rq(struct mlx5e_rq *rq,
 -                         struct mlx5e_rq_param *param)
 +int mlx5e_create_rq(struct mlx5e_rq *rq, struct mlx5e_rq_param *param)
  {
        struct mlx5_core_dev *mdev = rq->mdev;
- 
+       u8 ts_format;
        void *in;
        void *rqc;
        void *wq;

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tx.c
Simple merge

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

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

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