Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Tue, 24 Mar 2015 19:22:53 +0000 (15:22 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 24 Mar 2015 19:22:53 +0000 (15:22 -0400)
commit8ad483728bc498af4b99d0036b2edb163638c64a
treed565e26d41d3039f8af40d2316025d99af247d10
parente43e50524e6b00522cc7a1deee3eebd7046cde6f
parentbffb023ad2d44c0cfa8142ad8247391b32000998
Merge branch 'mlx4'

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>