Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Tue, 5 May 2015 23:39:13 +0000 (19:39 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 5 May 2015 23:39:13 +0000 (19:39 -0400)
commitbc321ed2db8ee03b2f2ba809286d3bf4eef1e5e0
tree525962c2f147a22285a41dcc9edaeb6fe63398e4
parent7aab5159fa0100ee3f80d1b0f55cd7e9b5823270
parent2d3c739739e64619f4846746a06ff0a6adf8a155
Merge branch 'mlx4'

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>