[ofa-general] linux-next: infiniband merge conflicts

[Stephen Rothwell]

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                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/general/attachments/20080331/a3dd44d0/attachment.sig>