fix: cpufreq: cherry-pick conflict