Hi Roland, Greg, Yesterday and today, I got a merge conflict between the infiniband tree and driver-core patch ib-convert-struct-class_device-to-struct-device.patch. The resolution is pretty tirivial, but maybe a better solution is for that patch to be added to the infinband tree.
The following files get conflicts: drivers/infiniband/hw/amso1100/c2_provider.c drivers/infiniband/hw/cxgb3/iwch_provider.c drivers/infiniband/hw/nes/nes_verbs.c -- Cheers, Stephen Rothwell [EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/
pgpLvZiSoqGe9.pgp
Description: PGP signature
_______________________________________________ general mailing list [email protected] http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
