From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Len Brown <lenb@kernel•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: linux-next: manual merge of the idle tree with Linus' tree
Date: Fri, 14 Nov 2014 12:59:41 +1100 [thread overview]
Message-ID: <20141114125941.3e1f44ff@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1128 bytes --]
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))
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-11-14 1:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-14 1:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-12-21 7:35 linux-next: manual merge of the idle tree with Linus' tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141114125941.3e1f44ff@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=lenb@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox