diff options
author | David S. Miller <davem@davemloft.net> | 2020-01-25 13:46:00 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-01-25 13:46:00 +0100 |
commit | 722943a54de95343c97c2a9ad658253393632f97 (patch) | |
tree | 7c90c38b6d1f3c8d440b9b5500df218ef6232242 /net/core | |
parent | 3546d8f1bbe992488ed91592cf6bf76e7114791a (diff) | |
parent | 342508c1c7540e281fd36151c175ba5ff954a99f (diff) |
Merge tag 'mlx5-fixes-2020-01-24' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
Mellanox, mlx5 fixes 2020-01-24
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')
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
0 files changed, 0 insertions, 0 deletions