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>
No related branches found
No related tags found
Showing
- drivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c 29 additions, 20 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c
- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c 7 additions, 2 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en_tc.c
- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c 3 additions, 1 deletiondrivers/net/ethernet/mellanox/mlx5/core/eswitch.c
- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c 9 additions, 4 deletionsdrivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
- drivers/net/ethernet/mellanox/mlx5/core/main.c 1 addition, 0 deletionsdrivers/net/ethernet/mellanox/mlx5/core/main.c
- drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c 2 additions, 1 deletiondrivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
- drivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c 29 additions, 13 deletionsdrivers/net/ethernet/mellanox/mlx5/core/steering/fs_dr.c
Loading
Please register or sign in to comment