From fe33fe10550ec372fe16ae955a179135c28ddd55 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Sep 19 2014 18:40:35 +0000
Subject: Disable NO_HZ_FULL again


- Enable early microcode loading (rhbz 1083716)

---

diff --git a/config-x86-generic b/config-x86-generic
index 98385cf..768e8f0 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -10,10 +10,12 @@ CONFIG_HPET_TIMER=y
 
 CONFIG_I8K=m
 CONFIG_SONYPI_COMPAT=y
-CONFIG_MICROCODE=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_EARLY=y
 CONFIG_MICROCODE_INTEL=y
 CONFIG_MICROCODE_INTEL_EARLY=y
 CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_AMD_EARLY=y
 
 CONFIG_X86_MSR=y
 CONFIG_X86_CPUID=y
diff --git a/config-x86_64-generic b/config-x86_64-generic
index b2b3a78..2f6155f 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -184,10 +184,8 @@ CONFIG_SFC_MTD=y
 CONFIG_MTD_CHAR=m
 CONFIG_MTD_BLOCK=m
 
-# CONFIG_NO_HZ_IDLE is not set
 CONFIG_NO_HZ_FULL=y
 # CONFIG_NO_HZ_IDLE is not set
-CONFIG_NO_HZ_FULL=y
-CONFIG_NO_HZ_FULL_ALL=y
+# CONFIG_NO_HZ_FULL_ALL is not set
 # CONFIG_NO_HZ_FULL_SYSIDLE is not set
 # CONFIG_CONTEXT_TRACKING_FORCE is not set
diff --git a/kernel.spec b/kernel.spec
index 8b2f25c..874ea0a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,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 1
+%global baserelease 2
 %global fedora_build %{baserelease}
 
 # base_sublevel is the kernel version we're starting with and patching
@@ -2215,6 +2215,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Disable NO_HZ_FULL again
+- Enable early microcode loading (rhbz 1083716)
+
 * Fri Sep 19 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.17.0-0.rc5.git4.1
 - Linux v3.17-rc5-63-gd9773ceabfaf
 - Enable infiniband on s390x