| Message ID | 20200529204610.253456-1-saeedm@mellanox.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
From: Saeed Mahameed <saeedm@mellanox.com> Date: Fri, 29 May 2020 13:46:03 -0700 > This series introduces some fixes to mlx5 driver. > > v1->v2: > - Fix bad sha1, Jakub. > - Added one more patch by Pablo. > net/mlx5e: replace EINVAL in mlx5e_flower_parse_meta() > > > Nothing major, the only patch worth mentioning is the suspend/resume crash > fix by adding the missing pci device handlers, the fix is very straight > forward and as Dexuan already expressed, the patch is important for Azure > users to avoid crash on VM hibernation, patch is marked for -stable v4.6 > below. > > Conflict note: > ('net/mlx5e: Fix MLX5_TC_CT dependencies') has a trivial one line conflict > with current net-next, which can be resolved by simply using the line from > net-next. > > Please pull and let me know if there is any problem. Pulled, and thanks for the conflict info. > For -stable v4.6 > ('net/mlx5: Fix crash upon suspend/resume') > > For -stable v5.6 > ('net/mlx5e: replace EINVAL in mlx5e_flower_parse_meta()') Queued up.
Hi Dave/Jakub, This series introduces some fixes to mlx5 driver. v1->v2: - Fix bad sha1, Jakub. - Added one more patch by Pablo. net/mlx5e: replace EINVAL in mlx5e_flower_parse_meta() Nothing major, the only patch worth mentioning is the suspend/resume crash fix by adding the missing pci device handlers, the fix is very straight forward and as Dexuan already expressed, the patch is important for Azure users to avoid crash on VM hibernation, patch is marked for -stable v4.6 below. Conflict note: ('net/mlx5e: Fix MLX5_TC_CT dependencies') has a trivial one line conflict with current net-next, which can be resolved by simply using the line from net-next. Please pull and let me know if there is any problem. For -stable v4.6 ('net/mlx5: Fix crash upon suspend/resume') For -stable v5.6 ('net/mlx5e: replace EINVAL in mlx5e_flower_parse_meta()') Thanks, Saeed. --- The following changes since commit 7c6d2ecbda83150b2036a2b36b21381ad4667762: net: be more gentle about silly gso requests coming from user (2020-05-28 16:31:30 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-fixes-2020-05-28 for you to fetch changes up to a683012a8e77675a1947cc8f11f97cdc1d5bb769: net/mlx5e: replace EINVAL in mlx5e_flower_parse_meta() (2020-05-29 13:07:54 -0700) ---------------------------------------------------------------- mlx5-fixes-2020-05-28 ---------------------------------------------------------------- Aya Levin (1): net/mlx5e: Fix arch depending casting issue in FEC Maor Dickman (1): net/mlx5e: Remove warning "devices are not on same switch HW" Mark Bloch (1): net/mlx5: Fix crash upon suspend/resume Pablo Neira Ayuso (1): net/mlx5e: replace EINVAL in mlx5e_flower_parse_meta() Roi Dayan (1): net/mlx5e: Fix stats update for matchall classifier Tal Gilboa (1): net/mlx5e: Properly set default values when disabling adaptive moderation Vlad Buslov (1): net/mlx5e: Fix MLX5_TC_CT dependencies drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 2 +- drivers/net/ethernet/mellanox/mlx5/core/en.h | 10 +++--- drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 24 +++++++------ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 41 +++++++++++++++------- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 20 +++++++---- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 12 +++---- drivers/net/ethernet/mellanox/mlx5/core/main.c | 18 ++++++++++ 7 files changed, 84 insertions(+), 43 deletions(-)