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

[Roland Dreier]

 > > 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.
 > 
 > I keep reverting that patch (and hope Greg will remove it from his
 > linux-next series (NEXT_PATCHES_START/END hint, hint :-))

Sorry, I'm not able to parse the antecedent of "that" in your
sentence.  Which patch are you hoping about?

 - R.