Have you looked at using the rM kernel sources instead of upstream?
Have you looked at using the rM kernel sources instead of upstream?