summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-06-24 19:23:42 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2017-06-24 19:23:42 +0200
commitcd9064be9b44da6a5a8591f1a0109e85a106411b (patch)
tree1ece29e2948d4dd6947d6c43850c9968f3fdaa43 /kernel.spec
parentb380ab5d76a8144ab99c9aa9c0c1970edd43c82c (diff)
parenta96f4ac8d92ccfbc3e3c89baf978e90bd3e3012f (diff)
downloadkernel-cd9064be9b44da6a5a8591f1a0109e85a106411b.tar.gz
kernel-cd9064be9b44da6a5a8591f1a0109e85a106411b.tar.xz
kernel-cd9064be9b44da6a5a8591f1a0109e85a106411b.zip
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec8
1 files changed, 8 insertions, 0 deletions
diff --git a/kernel.spec b/kernel.spec
index b32e0aa49..d6c33f29f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -656,6 +656,11 @@ Patch683: RFC-audit-fix-a-race-condition-with-the-auditd-tracking-code.patch
Patch684: mm-larger-stack-guard-gap-between-vmas.patch
Patch685: mm-fix-new-crash-in-unmapped_area_topdown.patch
+# rhbz 1459676
+Patch686: 0001-netfilter-xtables-zero-padding-in-data_to_user.patch
+Patch687: 0002-netfilter-xtables-fix-build-failure-from-COMPAT_XT_A.patch
+
+
# END OF PATCH DEFINITIONS
%endif
@@ -2223,6 +2228,9 @@ fi
#
#
%changelog
+* Tue Jun 20 2017 Laura Abbott <labbott@fedoraproject.org>
+- Add fix for iptables (rhbz 1459676)
+
* Tue Jun 20 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.6-201
- bump and build