post merge fixes that restore tunnel offload functionality in mlx5. v2: resolve compilation error in ubuntu inbox.
Gregory Etelson (5): net/mlx5: fix tunnel offload object allocation net/mlx5: fix tunnel offload hub multi-thread protection net/mlx5: fix double table referencing net/mlx5: fix tunnel offload callback names net/mlx5: fix non-dv compilation errors drivers/net/mlx5/linux/mlx5_os.c | 16 +- drivers/net/mlx5/mlx5.c | 50 +- drivers/net/mlx5/mlx5.h | 4 +- drivers/net/mlx5/mlx5_flow.c | 1296 ++++++++++++++++++------------ drivers/net/mlx5/mlx5_flow.h | 23 +- drivers/net/mlx5/mlx5_flow_dv.c | 39 +- 6 files changed, 842 insertions(+), 586 deletions(-) -- 2.29.2

