>Sean Hefty wrote: >> What was the reason commit 1889 modified libibmad's mad_osd.h? > >Redefinition of macros. I can see what the change is, I want to understand why. Where is the conflict coming from?