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

[Roland Dreier]

 > 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.

I assume it's the __FUNCTION__ -> __func__ conversion causing the clash?

Greg, I'm fine with merging that patch through my tree.  The only
potential problem I see is if you also have the final class_device
removal patch in your tree too, in which case your tree then depends
on my tree in an unfortunate way.

Anyway, I'm flexible, let me know what works best for you.

 - R.