Hi David,
Today's linux-next merge of the net tree got conflicts in
drivers/infiniband/hw/amso1100/c2.c and
drivers/infiniband/hw/amso1100/c2_provider.c between commit
7edd87ddd12dd9a735e59d8381d10f25dacc6505 ("RDMA/amso1100: Convert to
net_device_ops") from the infiniband tree and commit
687c75dcf342f71329bd193af553e96a29581238 ("infiniband: convert c2 to
net_device_ops") from the net tree.
Presumably these are two versions of the same thing (the one in the
infiniband tree dates from January).
I fixed the conflicts using the version in the net tree. Someone should
check the result.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpvZKM0Qsw5x.pgp
Description: PGP signature
