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

[Stephen Rothwell]

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                    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/20080318/3e9c2077/attachment.sig>