From: Sasha Levin Date: Wed, 28 Aug 2019 15:47:05 +0000 (-0400) Subject: Add my sign off and upstream commit tag to a 4.4 commit X-Git-Tag: v4.14.141~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=23b77b7affa1fc47d8a9c82c7f8d45c790cf2c00;p=thirdparty%2Fkernel%2Fstable-queue.git Add my sign off and upstream commit tag to a 4.4 commit I used git-cherry-pick by mistake when taking it in. Fix up formatting... Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/x86-pm-introduce-quirk-framework-to-save-restore-ext.patch b/queue-4.4/x86-pm-introduce-quirk-framework-to-save-restore-ext.patch index 6215e99b37e..d13a5f268a9 100644 --- a/queue-4.4/x86-pm-introduce-quirk-framework-to-save-restore-ext.patch +++ b/queue-4.4/x86-pm-introduce-quirk-framework-to-save-restore-ext.patch @@ -4,6 +4,8 @@ Date: Wed, 25 Nov 2015 01:03:41 +0800 Subject: x86/pm: Introduce quirk framework to save/restore extra MSR registers around suspend/resume +[ Upstream commit 7a9c2dd08eadd5c6943115dbbec040c38d2e0822 ] + A bug was reported that on certain Broadwell platforms, after resuming from S3, the CPU is running at an anomalously low speed. @@ -64,6 +66,7 @@ Cc: rjw@rjwysocki.net Link: http://lkml.kernel.org/r/c9abdcbc173dd2f57e8990e304376f19287e92ba.1448382971.git.yu.c.chen@intel.com [ More edits to the naming of data structures. ] Signed-off-by: Ingo Molnar +Signed-off-by: Sasha Levin --- arch/x86/include/asm/msr.h | 10 ++++ arch/x86/include/asm/suspend_32.h | 1 +