From: Saeed Mahameed <saeed@kernel.org>
To: "David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, Saeed Mahameed <saeedm@nvidia.com>
Subject: [pull request][net 0/2] mlx5 fixes 2021-12-28
Date: Tue, 28 Dec 2021 22:53:50 -0800 [thread overview]
Message-ID: <20211229065352.30178-1-saeed@kernel.org> (raw)
From: Saeed Mahameed <saeedm@nvidia.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(-)
next reply other threads:[~2021-12-29 6:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-29 6:53 Saeed Mahameed [this message]
2021-12-29 6:53 ` [net 1/2] net/mlx5e: TC, Fix memory leak with rules with internal port Saeed Mahameed
2021-12-30 2:30 ` patchwork-bot+netdevbpf
2021-12-29 6:53 ` [net 2/2] net/mlx5e: Fix wrong features assignment in case of error Saeed Mahameed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211229065352.30178-1-saeed@kernel.org \
--to=saeed@kernel.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=saeedm@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).