From: David S. Miller Date: Tue, 3 May 2016 17:37:27 +0000 (-0400) Subject: Merge branch 'mlx5-fixes' X-Git-Tag: MMI-PSA29.97-13-9~8042^2~7 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3df8f4c6e928685e6fdf72b8d0d25e0c3a61cf7a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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: b7aade15485a ('vxlan: break dependency with netdev drivers') in net-next. Applied on top: f27337e16f2d ('ip_tunnel: fix preempt warning in ip tunnel creation/updating') ==================== Signed-off-by: David S. Miller --- 3df8f4c6e928685e6fdf72b8d0d25e0c3a61cf7a