]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'mlx4'
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 07:32:53 +0000 (00:32 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 Jun 2014 07:32:53 +0000 (00:32 -0700)
commit86435e7cde081527f008be880be7d32dc8c99550
treee284410c5e97c58174afd8e1d9ee259419e5ebcb
parentbae56fd59f48d858f68b859e96cc7ce68b98c42e
parent74ec565f2c5a72dd9db91ff1e3b8001a287d85f0
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>