Hi,

This patchset provides misc bug fixes from the team to the mlx5 core and
Eth drivers.

Thanks,
Tariq.

Carolina Jubran (2):
  net/mlx5: Prevent tunnel mode conflicts between FDB and NIC IPsec
    tables
  net/mlx5e: Prevent tunnel reformat when tunnel mode not allowed

Cosmin Ratiu (1):
  net/mlx5e: Do not fail PSP init on missing caps

 .../mellanox/mlx5/core/en_accel/ipsec.c       | 38 +++++++++++++------
 .../mellanox/mlx5/core/en_accel/ipsec.h       |  2 +-
 .../mellanox/mlx5/core/en_accel/ipsec_fs.c    | 32 ++++++++++------
 .../mellanox/mlx5/core/en_accel/psp.c         | 10 ++---
 .../net/ethernet/mellanox/mlx5/core/eswitch.h |  5 ++-
 .../mellanox/mlx5/core/eswitch_offloads.c     | 18 +++++----
 6 files changed, 67 insertions(+), 38 deletions(-)


base-commit: 1b54b0756f051c11f5a5d0fbc1581e0b9a18e2bc
-- 
2.31.1