Cleanup -m 118xx kernels to latest standard