From: David S. Miller <davem@davemloft.net>
Date: Wed, 23 Jun 2021 19:48:07 +0000 (-0700)
Subject: Merge tag 'mlx5-net-next-2021-06-22' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v5.14-rc1~119^2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe87797bf245946e9d07e4a9ca1cd92f48a410d6;p=thirdparty%2Flinux.git

Merge tag 'mlx5-net-next-2021-06-22' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux

Saeed Mahameed says:

====================
mlx5-net-next-2021-06-22

1) Various minor cleanups and fixes from net-next branch
2) Optimize mlx5 feature check on tx and
   a fix to allow Vxlan with Ipsec offloads
====================

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

fe87797bf245946e9d07e4a9ca1cd92f48a410d6