My pre-built kernels for v25 (out soon) will incorporate the third version of Mike's rotary fixes.
The patchfile for v25 is now to be applied *ON TOP* of the voladj + rotary patches.