| commit | 7e1a61b6c14e7b0816b800038781b9572d5154d4 | |
| author | David S. Miller <davem@davemloft.net> | |
| Wed, 11 Jun 2014 07:32:53 +0000 (11 00:32 -0700) | ||
| committer | David S. Miller <davem@davemloft.net> | |
| Wed, 11 Jun 2014 07:32:53 +0000 (11 00:32 -0700) | ||
| tree | e284410c5e97c58174afd8e1d9ee259419e5ebcb | treesnapshot (tar.gz zip) |
| parent | f05d435bde588ac26ba75f7f6893b2a63ae71381 | commitdiff |
| parent | da1de8dfff09d33d4a5345762c21b487028e25f5 | commitdiff |
Merge branch 'mlx4'
Or Gerlitz says:
====================
mlx4 SRIOV fixes
The patch from Wei Yang is a designed fix to a regression introduced by earlier commit
of him. Jack added a fix to the resource management which we got from IBM.
Let's get that into 3.16-rc1 1st and later see to what stable version/s this should go.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Or Gerlitz says:
====================
mlx4 SRIOV fixes
The patch from Wei Yang is a designed fix to a regression introduced by earlier commit
of him. Jack added a fix to the resource management which we got from IBM.
Let's get that into 3.16-rc1 1st and later see to what stable version/s this should go.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>