diff options
| author | David S. Miller <davem@davemloft.net> | 2016-05-03 13:37:27 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-05-03 13:37:27 -0400 |
| commit | 3df8f4c6e928685e6fdf72b8d0d25e0c3a61cf7a (patch) | |
| tree | 0693e4e18bd384afde82787e7fb7cbb442bc9758 /tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py | |
| parent | 6071bd1aa13ed9e41824bafad845b7b7f4df5cfd (diff) | |
| parent | d8cf2dda3de6e6293fb01539fb4e180a7ab42afd (diff) | |
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 <davem@davemloft.net>
Diffstat (limited to 'tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py')
0 files changed, 0 insertions, 0 deletions