summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-03-14 07:45:49 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-03-15 08:32:35 -0400
commit8a56c6cd5979e5cddaa9886419dde1f58a4cecde (patch)
treecc8c8d4664d7825828005c9da9ce930ec01ca7a3 /kernel.spec
parent73964d96a7a08f2de053d783efe97d3dd1a690a5 (diff)
downloadkernel-8a56c6cd5979e5cddaa9886419dde1f58a4cecde.tar.gz
kernel-8a56c6cd5979e5cddaa9886419dde1f58a4cecde.tar.xz
kernel-8a56c6cd5979e5cddaa9886419dde1f58a4cecde.zip
Fix divide by zero on host TSC calibration failure (rhbz 859282)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index bd182bf27..6c55b26dd 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 1
+%global baserelease 2
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -740,6 +740,9 @@ Patch21271: drm-i915-bounds-check-execbuffer-relocation-count.patch
Patch21273: cfg80211-mac80211-disconnect-on-suspend.patch
Patch21274: mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch
+#rhbz 859282
+Patch21275: VMX-x86-handle-host-TSC-calibration-failure.patch
+
Patch22000: weird-root-dentry-name-debug.patch
#selinux ptrace child permissions
@@ -1438,6 +1441,9 @@ ApplyPatch drm-i915-bounds-check-execbuffer-relocation-count.patch
ApplyPatch cfg80211-mac80211-disconnect-on-suspend.patch
ApplyPatch mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch
+#rhbz 859282
+ApplyPatch VMX-x86-handle-host-TSC-calibration-failure.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2279,6 +2285,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Mar 15 2013 Josh Boyer <jwboyer@redhat.com>
+- Fix divide by zero on host TSC calibration failure (rhbz 859282)
+
* Fri Mar 15 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc2.git1.1
- Linux v3.9-rc2-292-ga2362d2
- Fixes CVE-2013-1860 kernel: usb: cdc-wdm buffer overflow triggered by device