Messages in this thread | | | Date | Fri, 22 Feb 2013 11:50:21 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the infiniband tree with Linus' tree |
| |
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).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |