Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/infiniband/ulp/ipoib/ipoib_main.c between commit
574d30e9fd416037fc85bcbb148074214aee50e1 ("IPoIB: Convert to
net_device_ops") from the infiniband tree and commit
fe8114e8e1d15ba07ddcaebc4741957a1546f307 ("infiniband: convert ipoib to
net_device_ops") from the net tree.
Again different versions of the same change. I used the net tree version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpcn170im3RX.pgp
Description: PGP signature
