Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/cpufreq/intel_pstate.c
between commit:
7791e4aa59ad ("cpufreq: intel_pstate: Enable HWP by default")
from the pm tree and commit:
bc696ca05f5a ("x86/cpufeature: Replace the old static_cpu_has() with safe variant")
from the tip tree.
I fixed it up (the former removed the code modified by the latter)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
