diff options
author | David S. Miller <davem@davemloft.net> | 2017-06-16 05:22:23 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-16 05:22:23 +0300 |
commit | be56a099e0f990532e10c940a3778303cc5a0d91 (patch) | |
tree | 91f710107a539fd98f4cc764cd3e713ef0740e49 /net/ipv4/ip_tunnel.c | |
parent | 3b1bbafbfd14474fee61487552c9916ec1b25c58 (diff) | |
parent | 31ac93386d135a6c96de9c8bab406f5ccabf5a4d (diff) | |
download | linux-be56a099e0f990532e10c940a3778303cc5a0d91.tar.xz |
Merge tag 'mlx5-fixes-2017-06-14' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
Mellanox mlx5 fixes 2017-06-14
This series contains some fixes for the mlx5 core and netdev driver.
Please pull and let me know if there's any problem.
For -stable:
("net/mlx5: Wait for FW readiness before initializing command interface") kernels >= 4.4
("net/mlx5e: Fix timestamping capabilities reporting") kernels >= 4.5
("net/mlx5e: Avoid doing a cleanup call if the profile doesn't have it") kernels >= 4.9
("net/mlx5e: Fix min inline value for VF rep SQs") kernels >= 4.11
The "net/mlx5e: Fix min inline .." (a oneliner patch) doesn't cleanly apply
to 4.11, it hits a contextual conflict and can be easily resolved by:
+ mlx5_query_min_inline(mdev, &priv->params.tx_min_inline_mode);
to the end of mlx5e_build_rep_netdev_priv. Note the 2nd parameter of
mlx5_query_min_inline is slightly different from the original one.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel.c')
0 files changed, 0 insertions, 0 deletions