One thing that seems hard to counter is getting already forked drivers out of the kernel (c.f. drivers/mmc/msm_sdcc.* which is a clone of mmci.*), and feeling helpless about that whole business. I have toyed with the idea of proposing patches deleting the inferior forks, but that feels hostile, at the same time asking kindly top merge support into the existing driver doesn't seem to work either.