[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200124202033.13421-1-saeedm@mellanox.com>
Date: Fri, 24 Jan 2020 20:20:50 +0000
From: Saeed Mahameed <saeedm@...lanox.com>
To: "David S. Miller" <davem@...emloft.net>
CC: "netdev@...r.kernel.org" <netdev@...r.kernel.org>,
Saeed Mahameed <saeedm@...lanox.com>
Subject: [pull request][net 0/9] Mellanox, mlx5 fixes 2020-01-24
Hi Dave,
This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
Merge conflict: once merge with net-next, a contextual conflict will
appear in drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
since the code moved in net-next.
To resolve, just delete ALL of the conflicting hunk from net.
So sorry for the small mess ..
For -stable v5.4:
('net/mlx5: Update the list of the PCI supported devices')
('net/mlx5: Fix lowest FDB pool size')
('net/mlx5e: kTLS, Fix corner-case checks in TX resync flow')
('net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path')
('net/mlx5: Eswitch, Prevent ingress rate configuration of uplink rep')
('net/mlx5e: kTLS, Remove redundant posts in TX resync flow')
('net/mlx5: DR, Enable counter on non-fwd-dest objects')
('net/mlx5: DR, use non preemptible call to get the current cpu number')
Thanks,
Saeed.
---
The following changes since commit 623c8d5c74c69a41573da5a38bb59e8652113f56:
Merge branch 'netdev-seq_file-next-functions-should-increase-position-index' (2020-01-24 11:42:18 +0100)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git tags/mlx5-fixes-2020-01-24
for you to fetch changes up to 342508c1c7540e281fd36151c175ba5ff954a99f:
net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path (2020-01-24 12:04:40 -0800)
----------------------------------------------------------------
mlx5-fixes-2020-01-24
----------------------------------------------------------------
Dmytro Linkin (1):
net/mlx5e: Clear VF config when switching modes
Eli Cohen (1):
net/mlx5: E-Switch, Prevent ingress rate configuration of uplink rep
Erez Shitrit (2):
net/mlx5: DR, Enable counter on non-fwd-dest objects
net/mlx5: DR, use non preemptible call to get the current cpu number
Meir Lichtinger (1):
net/mlx5: Update the list of the PCI supported devices
Paul Blakey (1):
net/mlx5: Fix lowest FDB pool size
Tariq Toukan (3):
net/mlx5e: kTLS, Fix corner-case checks in TX resync flow
net/mlx5e: kTLS, Remove redundant posts in TX resync flow
net/mlx5e: kTLS, Do not send decrypted-marked SKBs via non-accel path
.../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 49 +++++++++++++---------
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 9 +++-
drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 4 +-
.../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 13 ++++--
drivers/net/ethernet/mellanox/mlx5/core/main.c | 1 +
.../ethernet/mellanox/mlx5/core/steering/dr_send.c | 3 +-
.../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 42 +++++++++++++------
7 files changed, 80 insertions(+), 41 deletions(-)
Powered by blists - more mailing lists