summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-06-30 15:21:06 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-06-30 15:21:06 -0400
commit07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e (patch)
tree2f8c7d52bf1fab8ea225a82c3a0fbf3f201de23c /kernel.spec
parent76620421ecce053257835ae6191dd29d7219f9b7 (diff)
downloadkernel-07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e.tar.gz
kernel-07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e.tar.xz
kernel-07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e.zip
Backport netfilter panic fix (rhbz 1015989)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec9
1 files changed, 9 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 09674a11e..b64eb4e24 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -752,6 +752,9 @@ Patch25109: revert-input-wacom-testing-result-shows-get_report-is-unnecessary.pa
#rhbz 1021036, submitted upstream
Patch25110: 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
+#rhbz 1015989
+Patch25111: netfilter-nf_nat-fix-oops-on-netns-removal.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1472,6 +1475,9 @@ ApplyPatch revert-input-wacom-testing-result-shows-get_report-is-unnecessary.pat
#rhbz 1021036, submitted upstream
ApplyPatch 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch
+#rhbz 1015989
+ApplyPatch netfilter-nf_nat-fix-oops-on-netns-removal.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2284,6 +2290,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Jun 30 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Backport netfilter panic fix (rhbz 1015989)
+
* Sun Jun 29 2014 Peter Robinson <pbrobinson@fedoraproject.org>
- Rebase ARM based BeagleBone and Utilite stable patches