Hi Roland, Today's linux-next merge of the infiniband tree produced conflicts in drivers/infiniband/core/cma.c and drivers/infiniband/core/cm.c. The conflicts were against Al Viro's patch "trivial endianness annotations: infiniband core" (Linus' commit id 1b90c137cc2a0e9b813a8ae316827c493c664146). They are reasonably trivial.
-- Cheers, Stephen Rothwell [EMAIL PROTECTED] http://www.canb.auug.org.au/~sfr/
pgpHz9LbXFF71.pgp
Description: PGP signature
_______________________________________________ general mailing list general@lists.openfabrics.org http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
