From: David S. Miller Date: Wed, 11 Jun 2014 07:32:53 +0000 (-0700) Subject: Merge branch 'mlx4' X-Git-Tag: v3.16-rc1~27^2~39 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7e1a61b6c14e7b0816b800038781b9572d5154d4;p=linux.git 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 --- 7e1a61b6c14e7b0816b800038781b9572d5154d4