Merge tag 'mlx5-updates-2018-12-19' of git://git.kernel.org/pub/scm/linux/kernel...

Saeed Mahameed says:

====================
mlx5-updates-2018-12-19

This series adds some misc updates and the support for tunnels over VLAN
tc offloads.

From Miroslav Lichvar, patches #1,2
1) Update timecounter at least twice per counter overflow
2) Extend PTP gettime function to read system clock

From Gavi Teitz, patch #3
3) Increase VF representors' SQ size to 128

From Eli Britstein and Or Gerlitz, patches #4-10
4) Adds the capability to support tunnels over VLAN device.

Patch 4 avoids crash for TC flow with egress upper devices

Patch 5 refactors tunnel routing devs into a helper function

Patch 6 avoids crash for TC encap flows with vlan on underlay

Patches 7-8 refactor encap tunnel header preparing code.

Patch 9 adds support for building VLAN tagged ETH header.

Patch 10 adds support for tunnel routing to VLAN device.

From Aviv, patches 11,12 to fix earlier VF lag series
5) Fix query_nic_sys_image_guid() error during init
6) Fix LAG requirement when CONFIG_MLX5_ESWITCH is off
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
index 3a177133e230f92c730acbd3f83369e3ccc95f50,f414f19c1159c2ecd073782300548fe8201d84de..dbbdbdff75e86c850e14393aee8786aa63170876
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@@ -45,9 -45,8 +45,9 @@@
  #include "en/tc_tun.h"
  #include "fs_core.h"
  
- #define MLX5E_REP_PARAMS_LOG_SQ_SIZE \
-       max(0x6, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
+ #define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \
 -      max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
++        max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
 +#define MLX5E_REP_PARAMS_DEF_NUM_CHANNELS 1
  
  static const char mlx5e_rep_driver_name[] = "mlx5e_rep";
  

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