From: David S. Miller Date: Sat, 27 Apr 2013 03:29:21 +0000 (-0400) Subject: Merge branch 'mlx4' X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b38a54eaa0acc5991cbad93bf44b355aa43f6d6f;p=~shefty%2Frdma-dev.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 37fe0660981d7a "net: fix address check in rtnl_fdb_del" 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. We added to the V1 series two patches that disable HW timestamping when running over a VF, as this isn't supported yet. ==================== Signed-off-by: David S. Miller --- b38a54eaa0acc5991cbad93bf44b355aa43f6d6f