diff options
| author | David S. Miller <davem@davemloft.net> | 2019-03-29 15:23:16 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-29 15:23:16 -0700 |
| commit | 19c847444d1e94ca1f6183a3eea968d00d5d0a95 (patch) | |
| tree | c731202ef87c5d2b11a6b1dd68ae75fb7dbe4901 /kernel | |
| parent | ec915f4744a0a556090874a4a78e85afea77471a (diff) | |
| parent | 7f1a546e322287ae948e0f5eb8d12b7b638d93a6 (diff) | |
| download | linux-19c847444d1e94ca1f6183a3eea968d00d5d0a95.tar.bz2 | |
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>
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions