[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20211229065352.30178-1-saeed@kernel.org>
Date: Tue, 28 Dec 2021 22:53:50 -0800
From: Saeed Mahameed <saeed@...nel.org>
To: "David S. Miller" <davem@...emloft.net>,
Jakub Kicinski <kuba@...nel.org>
Cc: netdev@...r.kernel.org, Saeed Mahameed <saeedm@...dia.com>
Subject: [pull request][net 0/2] mlx5 fixes 2021-12-28
From: Saeed Mahameed <saeedm@...dia.com>
Hi Dave, Hi Jakub,
This series provides bug fixes to mlx5 driver.
Please pull and let me know if there is any problem.
There will be a very small trivial conflict when net merged with
net-next,
++<<<<<<< HEAD
++ goto err_out;
++||||||| 391e5975c020
++ return err;
++=======
goto err_out;
+
+ attr->action |= MLX5_FLOW_CONTEXT_ACTION_MOD_HDR;
++>>>>>>> this pr
To solve just take the hunk from net (this pr)
Thanks,
Saeed.
The following changes since commit 9665e03a8de5df719904611e03f908cd5b9f52f6:
Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue (2021-12-28 16:19:10 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-fixes-2021-12-28
for you to fetch changes up to 992d8a4e38f0527f24e273ce3a9cd6dea1a6a436:
net/mlx5e: Fix wrong features assignment in case of error (2021-12-28 22:42:50 -0800)
----------------------------------------------------------------
mlx5-fixes-2021-12-28
----------------------------------------------------------------
Gal Pressman (1):
net/mlx5e: Fix wrong features assignment in case of error
Roi Dayan (1):
net/mlx5e: TC, Fix memory leak with rules with internal port
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 11 +++++------
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 2 ++
2 files changed, 7 insertions(+), 6 deletions(-)
Powered by blists - more mailing lists