[kernel/f18] Enable CONFIG_MCE_INJECT (rhbz 927353)

Josh Boyer jwboyer at fedoraproject.org
Mon Apr 1 16:46:37 UTC 2013


commit 5fab95dc2e30d1b0962b1f00dc513980f8de2efc
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Mon Apr 1 12:43:09 2013 -0400

    Enable CONFIG_MCE_INJECT (rhbz 927353)

 config-x86-generic |    2 +-
 kernel.spec        |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/config-x86-generic b/config-x86-generic
index 8c4609d..761e1da 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -348,7 +348,7 @@ CONFIG_PERF_EVENTS=y
 CONFIG_X86_MCE=y
 CONFIG_X86_MCE_INTEL=y
 CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_MCE_INJECT=m
 
 CONFIG_SFI=y
 
diff --git a/kernel.spec b/kernel.spec
index bb663e8..e9be004 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -62,7 +62,7 @@ Summary: The Linux kernel
 # For non-released -rc kernels, this will be appended after the rcX and
 # gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
 #
-%global baserelease 201
+%global baserelease 202
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2397,6 +2397,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Apr 01 2013 Josh Boyer <jwboyer at redhat.com>
+- Enable CONFIG_MCE_INJECT (rhbz 927353)
+
 * Thu Mar 28 2013 Josh Boyer <jwboyer at redhat.com> - 3.8.5-201
 - Linux v3.8.5
 


More information about the scm-commits mailing list