Merge branch 'mlx5-net'

Browse source

Eli Cohen says:

====================
mlx5_core fixes for 3.18

the following two patches fix races to could lead to kernel panic in some cases.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2014-11-06 16:40:47 -05:00

parent b31f65fb43 364d1798ef

commit c811906726

2 changed files with 5 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

7

drivers/net/ethernet/mellanox/mlx5/core/eq.c

View file

4

drivers/net/ethernet/mellanox/mlx5/core/main.c

View file