From: David S. Miller Date: Wed, 24 Apr 2013 20:30:23 +0000 (-0400) Subject: Merge branch 'mlx4' X-Git-Tag: v3.12-rc1~874^2~50 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0996076973856e093c84ed870501fb9d5c72f8a3;p=kernel%2Fkernel-generic.git Merge branch 'mlx4' Or Gerlitz says: ==================== This series adds support for the SRIOV ndo_set_vf callbacks to the mlx4 driver. Series done against the net-next tree as of commit 0c501345c "batman-adv: fix global protection fault during soft_iface destruction". We have successfully tested the series on net-next, except for getting the VF link info issue I have reported earlier today on netdev, we see the problem for both ixgbe and mlx4 VFs. Just to make sure get VF config is working OK with patch #6 - we have run it over 3.8.8 too. ==================== Signed-off-by: David S. Miller --- 0996076973856e093c84ed870501fb9d5c72f8a3