$ 0 0 Hi all, Today's linux-next merge of the tip tree got a conflict in: drivers/cpufreq/intel_pstate.c between commit: 7791e4aa59ad ("cpufreq: int