diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-24 16:17:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-10-24 16:17:22 +0200 |
commit | 4c58d35e51eed200456a782486863d857023c2de (patch) | |
tree | 86bc6b4875bcf5d2062ecda7025eefbdef423638 /kernel.spec | |
parent | ebcf6a4a1d43c8b0f04ba7a5d35fb710acf562d4 (diff) | |
parent | 7bb512ee31ba792ca2a56fb44ce8aa77d8ed313d (diff) | |
download | kernel-4c58d35e51eed200456a782486863d857023c2de.tar.gz kernel-4c58d35e51eed200456a782486863d857023c2de.tar.xz kernel-4c58d35e51eed200456a782486863d857023c2de.zip |
Merge remote-tracking branch 'origin/f25' into f25-user-thl-vanilla-fedorakernel-4.8.4-300.vanilla.knurd.1.fc25kernel-4.8.4-300.vanilla.knurd.1.fc24kernel-4.8.4-300.vanilla.knurd.1.fc23
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec index 29252e00d..d51cc2a69 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 3 +%define stable_update 4 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -642,16 +642,6 @@ Patch848: 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch #ongoing complaint, full discussion delayed until ksummit/plumbers Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch -#CVE-2016-7425 rhbz 1377330 1377331 -Patch850: arcmsr-buffer-overflow-in-archmsr_iop_message_xfer.patch - -#rhbz 1366842 -Patch851: drm-virtio-reinstate-drm_virtio_set_busid.patch - -# Fix memory corruption caused by p8_ghash -Patch852: 0001-crypto-ghash-generic-move-common-definitions-to-a-ne.patch -Patch853: 0001-crypto-vmx-Fix-memory-corruption-caused-by-p8_ghash.patch - # END OF PATCH DEFINITIONS %endif @@ -2191,6 +2181,9 @@ fi # # %changelog +* Mon Oct 24 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.4-300 +- Linux v4.8.4 + * Thu Oct 20 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.3-300 - Linux v4.8.3 - CVE-2016-5195 (rhbz 1384344 1387080) |