Skip to content
Commit 3df8f4c6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx5-fixes'

Saeed Mahameed says:

====================
Mellanox 100G mlx5 fixes for 4.6-rc

This small series provides some bug fixes for mlx5 driver.

A small bug fix for iounmap of a null pointer, which dumps a warning on some archs.

One patch to fix the VXLAN/MLX5_EN dependency issue reported by Arnd.

Two patches to fix the scheduling while atomic issue for ndo_add/del_vxlan_port
NDOs.  The first will add an internal mlx5e workqueue and the second will
delegate vxlan ports add/del requests to that workqueue.

Note: ('net/mlx5: Kconfig: Fix MLX5_EN/VXLAN build issue') is only needed for net
and not net-next as the issue was globally fixed for all device drivers by:
b7aade15 ('vxlan: break dependency with netdev drivers') in net-next.

Applied on top: f27337e1

 ('ip_tunnel: fix preempt warning in ip tunnel creation/updating')
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6071bd1a d8cf2dda
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment