summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2016-10-20 15:44:11 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2016-10-20 15:44:11 +0200
commitebcf6a4a1d43c8b0f04ba7a5d35fb710acf562d4 (patch)
treebed59e81c38c703e563dc9cb0a07b9acfbd351f9
parent9429af57896f540f481dbac86ad730741108c4fa (diff)
parent513d3dd4355f28afa405ae8871342afa1f25e929 (diff)
downloadkernel-ebcf6a4a1d43c8b0f04ba7a5d35fb710acf562d4.tar.gz
kernel-ebcf6a4a1d43c8b0f04ba7a5d35fb710acf562d4.tar.xz
kernel-ebcf6a4a1d43c8b0f04ba7a5d35fb710acf562d4.zip
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.8.3-300.vanilla.knurd.1.fc25kernel-4.8.3-300.vanilla.knurd.1.fc24kernel-4.8.3-300.vanilla.knurd.1.fc23
-rw-r--r--kernel.spec9
-rw-r--r--sources2
2 files changed, 6 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index a2c83bf54..29252e00d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -58,7 +58,7 @@ Summary: The Linux kernel
%define stable_rc 0
# Do we have a -stable update to apply?
-%define stable_update 2
+%define stable_update 3
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -652,9 +652,6 @@ Patch851: drm-virtio-reinstate-drm_virtio_set_busid.patch
Patch852: 0001-crypto-ghash-generic-move-common-definitions-to-a-ne.patch
Patch853: 0001-crypto-vmx-Fix-memory-corruption-caused-by-p8_ghash.patch
-#rhbz 1384606
-Patch854: 0001-Make-__xfs_xattr_put_listen-preperly-report-errors.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -2194,6 +2191,10 @@ fi
#
#
%changelog
+* Thu Oct 20 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.3-300
+- Linux v4.8.3
+- CVE-2016-5195 (rhbz 1384344 1387080)
+
* Tue Oct 18 2016 Justin M. Forbes <jforbes@fedoraproject.org>
- Fix memory corruption caused by p8_ghash
- Make __xfs_xattr_put_listen preperly report errors (rhbz 1384606)
diff --git a/sources b/sources
index 844149f62..05f9de7bf 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
c1af0afbd3df35c1ccdc7a5118cd2d07 linux-4.8.tar.xz
0dad03f586e835d538d3e0d2cbdb9a28 perf-man-4.8.tar.gz
-7bbd3c729fa79169f7234ae3ed06b46c patch-4.8.2.xz
+9e430392b1cc430522fa7b27fc4301fc patch-4.8.3.xz