Merge tag 'mlx5-fixes-2019-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
Mellanox, mlx5 fixes 2019-03-29
This series introduces some fixes to mlx5 driver.
Please pull and let me know if there is any problem.
For -stable v4.11
('net/mlx5: Decrease default mr cache size')
For -stable v4.12
('net/mlx5e: Add a lock on tir list')
For -stable v4.13
('net/mlx5e: Fix error handling when refreshing TIRs')
For -stable v4.18
('net/mlx5e: Update xon formula')
For -stable v4.19
('net: mlx5: Add a missing check on idr_find, free buf')
('net/mlx5e: Update xoff formula')
net-next merge Note:
When merged with net-next the following simple conflict will appear,
drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
++<<<<<<< HEAD (net)
+ * max_mtu: netdev's max_mtu
++=======
+ * @mtu: device's MTU
++>>>>>>> net-next
To resolve: just replace the line in net-next
* @mtu: device's MTU
to
* @max_mtu: netdev's max_mtu
====================
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- drivers/net/ethernet/mellanox/mlx5/core/en/port.c 0 additions, 3 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en/port.c
- drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c 22 additions, 17 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c
- drivers/net/ethernet/mellanox/mlx5/core/en_common.c 11 additions, 2 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en_common.c
- drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c 34 additions, 18 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
- drivers/net/ethernet/mellanox/mlx5/core/en_tc.c 68 additions, 14 deletionsdrivers/net/ethernet/mellanox/mlx5/core/en_tc.c
- drivers/net/ethernet/mellanox/mlx5/core/eswitch.c 5 additions, 4 deletionsdrivers/net/ethernet/mellanox/mlx5/core/eswitch.c
- drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c 1 addition, 0 deletionsdrivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
- drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c 11 additions, 3 deletionsdrivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c
- drivers/net/ethernet/mellanox/mlx5/core/main.c 0 additions, 20 deletionsdrivers/net/ethernet/mellanox/mlx5/core/main.c
- include/linux/mlx5/driver.h 2 additions, 0 deletionsinclude/linux/mlx5/driver.h
Loading
Please register or sign in to comment