summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-03-21 09:04:30 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-03-21 09:13:15 -0400
commit60b78be5a968238192c843b00d54de7fbb6e25c2 (patch)
tree9cfe73b8b6ba538154ae2a64c2014418a5bd66ba /kernel.spec
parentf09cfb830021a94197272aed40f483269fbec8a6 (diff)
downloadkernel-60b78be5a968238192c843b00d54de7fbb6e25c2.tar.gz
kernel-60b78be5a968238192c843b00d54de7fbb6e25c2.tar.xz
kernel-60b78be5a968238192c843b00d54de7fbb6e25c2.zip
Fix workqueue crash in mac80211 (rhbz 920218)
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 557baebc2..1f56d3aaf 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 920218
+Patch21276: mac80211-Dont-restart-sta-timer-if-not-running.patch
+
#rhbz 859282
Patch21275: VMX-x86-handle-host-TSC-calibration-failure.patch
@@ -1443,6 +1446,9 @@ ApplyPatch mac80211_fixes_for_ieee80211_do_stop_while_suspend_v3.9.patch
#rhbz 859282
ApplyPatch VMX-x86-handle-host-TSC-calibration-failure.patch
+#rhbz 920218
+ApplyPatch mac80211-Dont-restart-sta-timer-if-not-running.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2284,6 +2290,9 @@ fi
# ||----w |
# || ||
%changelog
+* Thu Mar 21 2013 Josh Boyer <jwboyer@redhat.com>
+- Fix workqueue crash in mac80211 (rhbz 920218)
+
* Thu Mar 21 2013 Josh Boyer <jwboyer@redhat.com> - 3.9.0-0.rc3.git1.1
- Linux v3.9-rc3-148-g2ffdd7e
- Fixes CVE-2013-1796, CVE-2013-1797, CVE-2013-1798 in kvm.