From: David S. Miller Date: Mon, 5 May 2014 19:49:29 +0000 (-0400) Subject: Merge branch 'mlx4' X-Git-Tag: omap-for-v3.16/fixes-against-rc1~214^2~7 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=eaff82929c1daf900e40763936a14f9cb2ba4d7b Merge branch 'mlx4' Or Gerlitz says: ==================== This series contains fixes for 3.15-rc, mostly around SRIOV. The patches by Jack, Matan and myself fix few issues related to mlx4 SRIOV support for RoCE and single port VFs, and the patch from Eyal eliminates checking PCI caps for VFs which is misleading. Patches done against the net tree, commit 014f1b2 "net: bonding: Fix format string mismatch in bond_sysfs.c" We'd be happy to get Eyal's patch queued in your -stable list for 3.14.y ==================== Signed-off-by: David S. Miller --- eaff82929c1daf900e40763936a14f9cb2ba4d7b