Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1345477 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2016-02-29 05:50 +0100 |
| Last post | 2016-02-29 05:50 +0100 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
linux-next: manual merge of the tip tree with the pm tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-29 05:50 +0100
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2016-02-29 05:50 +0100 |
| Subject | linux-next: manual merge of the tip tree with the pm tree |
| Message-ID | <r7nWq-5to-3@gated-at.bofh.it> |
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
Back to top | Article view | linux.kernel
csiph-web