Merge branch 'mlx4'

Browse source

Or Gerlitz says:

====================
mlx4 fixes for 4.1-rc2

Eran's fix is for a small off-by-one introduces on 4.1-rc1.

Yisahi fixes an issue with comes into play only on VMs with
many (> 256) vCPUs.
====================

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

...

This commit is contained in:

David S. Miller 2015-05-05 19:39:13 -04:00

parent 7aab5159fa 2d3c739739

commit bc321ed2db

2 changed files with 8 additions and 8 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/en_port.c

View file

14

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

View file