From: David S. Miller Date: Fri, 29 Mar 2019 22:23:16 +0000 (-0700) Subject: Merge tag 'mlx5-fixes-2019-03-29' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: v5.15~6655^2~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19c847444d1e94ca1f6183a3eea968d00d5d0a95;p=platform%2Fkernel%2Flinux-starfive.git Merge tag 'mlx5-fixes-2019-03-29' of git://git./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 --- 19c847444d1e94ca1f6183a3eea968d00d5d0a95