summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-07-05 08:57:12 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-07-05 09:05:28 -0400
commit8fb285bdac75a903894b65ca8a9ef1172d37aeb4 (patch)
tree61195ff2c0d921075e98bcf78cd109705eaa7020 /kernel.spec
parentaf1ede06d2a0b705fb90c01df64829f83aa21eb6 (diff)
downloadkernel-8fb285bdac75a903894b65ca8a9ef1172d37aeb4.tar.gz
kernel-8fb285bdac75a903894b65ca8a9ef1172d37aeb4.tar.xz
kernel-8fb285bdac75a903894b65ca8a9ef1172d37aeb4.zip
Add fix for timer issue in bridge code (rhbz 980254)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index c832eb950..c39fa225e 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
@@ -784,6 +784,8 @@ Patch25052: HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
#rhbz 880035
Patch25053: bridge-only-expire-the-mdb-entry-when-query-is-received.patch
Patch25054: bridge-send-query-as-soon-as-leave-is-received.patch
+#rhbz 980254
+Patch25061: bridge-timer-fix.patch
#rhbz 977558
Patch25055: ath3k-dont-use-stack-memory-for-DMA.patch
@@ -1501,6 +1503,7 @@ ApplyPatch HID-input-return-ENODATA-if-reading-battery-attrs-fails.patch
#rhbz 880035
ApplyPatch bridge-only-expire-the-mdb-entry-when-query-is-received.patch
ApplyPatch bridge-send-query-as-soon-as-leave-is-received.patch
+ApplyPatch bridge-timer-fix.patch
#rhbz 977558
ApplyPatch ath3k-dont-use-stack-memory-for-DMA.patch
@@ -2305,6 +2308,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Jul 05 2013 Josh Boyer <jwboyer@redhat.com>
+- Add fix for timer issue in bridge code (rhbz 980254)
+
* Wed Jul 03 2013 Josh Boyer <jwboyer@redhat.com>
- Add patches to fix iwl skb managment (rhbz 977040)