On Fri, Feb 22, 2013 at 2:50 AM, Stephen Rothwell <[email protected]> wrote: > > Hi all, > > Today's linux-next merge of the infiniband tree got a conflict in > drivers/infiniband/ulp/ipoib/ipoib_ethtool.c between commit 7826d43f2db4 > ("ethtool: fix drvinfo strings set in drivers") from the tree and commit > 4b48680b5572 ("IPoIB: Add version and firmware info to ethtool > reporting") from the infiniband tree. > > I fixed it up (using the latter version as it included the change to use > strlcpy) and can carry the fix as necessary (no action is required).
thanks for fixing thay up! Acked-by: Or Gerlitz <[email protected]> -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
