summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-03-05 21:19:33 -0500
committerJosh Boyer <jwboyer@redhat.com>2013-03-05 21:19:33 -0500
commit3ce66bca1d49f88d7611c9db02d076739a6d7719 (patch)
treed0ac1162b9ca8b7d327e0f6ba2789e1cbcfb46b4 /kernel.spec
parent993b4799d83b0ac33e9191abc7238f3271b3eb69 (diff)
downloadkernel-3ce66bca1d49f88d7611c9db02d076739a6d7719.tar.gz
kernel-3ce66bca1d49f88d7611c9db02d076739a6d7719.tar.xz
kernel-3ce66bca1d49f88d7611c9db02d076739a6d7719.zip
Fix intel_pstate init error path (rhbz 916833)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 7 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 99fe2f0f2..5cb4fdb50 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 2
+%global baserelease 3
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -737,9 +737,10 @@ Patch21262: x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch
#rhbz 916833
Patch21263: intel-pstate-do-not-load-on-VM-that-do-not-report-max-P-state.patch
+Patch21264: intel_pstate-Fix-intel_pstate_init-error-path.patch
#rhbz 917984
-Patch21264: efi-fixes.patch
+Patch21265: efi-fixes.patch
Patch22000: weird-root-dentry-name-debug.patch
@@ -1436,6 +1437,7 @@ ApplyPatch x86-mm-Fix-vmalloc_fault-oops-during-lazy-MMU-updates.patch
#rhbz 916833
ApplyPatch intel-pstate-do-not-load-on-VM-that-do-not-report-max-P-state.patch
+ApplyPatch intel_pstate-Fix-intel_pstate_init-error-path.patch
#rhbz 917984
ApplyPatch efi-fixes.patch
@@ -2281,6 +2283,9 @@ fi
# ||----w |
# || ||
%changelog
+* Tue Mar 05 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc1.git0.3
+- Fix intel_pstate init error path (rhbz 916833)
+
* Tue Mar 5 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Temporarily disable tegra until we get a fix from upstream