Messages in this thread | | | Date | Fri, 14 Nov 2014 12:59:41 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the idle tree with Linus' tree |
| |
Hi Len,
Today's linux-next merge of the idle tree got a conflict in arch/x86/include/uapi/asm/msr-index.h between commit 8c058d53f6f2 ("intel_idle: Disable Baytrail Core and Module C6 auto-demotion") from Linus' tree and commit a8b65b07d753 ("tools/power turbostat: decode MSR_*_PERF_LIMIT_REASONS") from the idle tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/include/uapi/asm/msr-index.h index e21331ce368f,c1cb18be540e..000000000000 --- a/arch/x86/include/uapi/asm/msr-index.h +++ b/arch/x86/include/uapi/asm/msr-index.h @@@ -149,9 -149,10 +149,13 @@@ #define MSR_CORE_C1_RES 0x00000660 +#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668 +#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669 + + #define MSR_CORE_PERF_LIMIT_REASONS 0x00000690 + #define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0 + #define MSR_RING_PERF_LIMIT_REASONS 0x000006B1 + #define MSR_AMD64_MC0_MASK 0xc0010044 #define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x)) [unhandled content-type:application/pgp-signature] | |