Hi David,
Today's linux-next merge of the net tree got a conflict in
drivers/infiniband/hw/nes/nes_nic.c between commit
77dfd6b11ac9f64e5f392be1ff3d14593dabaaf7 ("RDMA/nes: Convert to
net_device_ops") from the infiniband tree and commit
d0929553bebcac828b612e7d6d239559e08feaf4 ("infiniband: convert nes driver
to net_device_ops") from the net tree.
Again, presumably versions of the same thing. I used the net tree
version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpWysAMh7V4j.pgp
Description: PGP signature
