Cleanup -m 111xx kernels to latest standard