summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-06-11 16:22:22 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-06-11 16:22:45 -0400
commit1724a9954b1ac98ec3fca34c109275e1eb877783 (patch)
tree08159ee458718273106449afa00fe98211c99a07 /kernel.spec
parent10d51379489e6e3076a831464642b42181f3788f (diff)
downloadkernel-1724a9954b1ac98ec3fca34c109275e1eb877783.tar.gz
kernel-1724a9954b1ac98ec3fca34c109275e1eb877783.tar.xz
kernel-1724a9954b1ac98ec3fca34c109275e1eb877783.zip
Fix NFS NULL pointer deref with ipv6 (rhbz 1099761)
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index 065160aec..7e3d89806 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -728,6 +728,9 @@ Patch25096: drm-i915-set-backlight-duty-cycle-after-backlight-enable-for-gen4.pa
#rhbz 1064516
Patch25098: e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
+#rhbz 1099761
+Patch25099: NFS-populate-net-in-mount-data-when-remounting.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1424,6 +1427,9 @@ ApplyPatch drm-i915-set-backlight-duty-cycle-after-backlight-enable-for-gen4.pat
#rhbz 1064516
ApplyPatch e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch
+#rhbz 1099761
+ApplyPatch NFS-populate-net-in-mount-data-when-remounting.patch
+
# END OF PATCH APPLICATIONS
%endif
@@ -2237,6 +2243,7 @@ fi
# || ||
%changelog
* Wed Jun 11 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Fix NFS NULL pointer deref with ipv6 (rhbz 1099761)
- Fix promisc mode on certain e1000e cards (rhbz 1064516)
- Fix i915 backlight issue on gen4 (rhbz 1094066)