Merge branch 'mlx4'

Browse source

Or Gerlitz says:

====================
mlx4 driver RC fixes

Ido's patch should go to -stable of >= 3.14 too, the issue is older but it
hits us with VXLAN for which driver support dates there.

As for Jack's fix, for the time being, picking it to 4.0 is OK.
====================

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

...

This commit is contained in:

David S. Miller 2015-03-24 15:22:53 -04:00

parent e43e50524e bffb023ad2

commit 8ad483728b

4 changed files with 22 additions and 19 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

2

drivers/net/ethernet/mellanox/mlx4/cmd.c

View file

15

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

View file

18

drivers/net/ethernet/mellanox/mlx4/eq.c

View file

6

drivers/net/ethernet/mellanox/mlx4/resource_tracker.c

View file