summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-02-02 21:24:50 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2017-02-02 21:24:50 +0100
commit6e17d5167526e1cbed91801f272984fe7ae6300c (patch)
treeb1484b30f4eef3ec32c1c2e053a96fc1ec6ef162 /kernel.spec
parent8f10de5b246f32cd331d62a094b3c7d952e11eee (diff)
parentf97e1a8fef3e66216868391e7043d44c780b5f07 (diff)
downloadkernel-6e17d5167526e1cbed91801f272984fe7ae6300c.tar.gz
kernel-6e17d5167526e1cbed91801f272984fe7ae6300c.tar.xz
kernel-6e17d5167526e1cbed91801f272984fe7ae6300c.zip
Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedorakernel-4.9.7-100.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec21
1 files changed, 17 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec
index 13c4d1a72..807f3da95 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -59,7 +59,7 @@ Summary: The Linux kernel
# Do we have a -stable update to apply?
-%define stable_update 6
+%define stable_update 7
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -547,6 +547,8 @@ Patch432: bcm283x-fixes.patch
# http://www.spinics.net/lists/linux-mmc/msg41151.html
Patch433: bcm283x-mmc-imp-speed.patch
+Patch434: mm-alloc_contig-re-allow-CMA-to-compact-FS-pages.patch
+
Patch440: AllWinner-net-emac.patch
Patch442: ARM-Drop-fixed-200-Hz-timer-requirement-from-Samsung-platforms.patch
@@ -649,12 +651,12 @@ Patch851: selinux-namespace-fix.patch
#rhbz 1390308
Patch852: nouveau-add-maxwell-to-backlight-init.patch
-#CVE-2017-5576 CVE-2017-5577 rhbz 1416436 1416437 1416439
-Patch853: drm_vc4_Fix_an_integer_overflow_in_temporary_allocation_layout.patch
-
#The saddest EFI firmware bug
Patch854: 0001-x86-efi-always-map-first-physical-page-into-EFI-page.patch
+#CVE-2017-2596 rhbz 1417812 1417813
+Patch855: kvm-fix-page-struct-leak-in-handle_vmon.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2187,12 +2189,23 @@ fi
#
#
%changelog
+* Thu Feb 02 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.7-100
+- Linux v4.9.7
+
+* Tue Jan 31 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- Fix kvm nested virt CVE-2017-2596 (rhbz 1417812 1417813)
+
+* Tue Jan 31 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Fix CMA compaction regression (Raspberry Pi and others)
+
* Thu Jan 26 2017 Peter Robinson <pbrobinson@fedoraproject.org>
- arm64: dma-mapping: Fix dma_mapping_error() when bypassing SWIOTLB
* Thu Jan 26 2017 Laura Abbott <labbott@redhat.com> - 4.9.6-100
- Linux v4.9.6
- Bring in fix for bogus EFI firmware
+- Fixes CVE-2017-5547, CVE-2016-10153, CVE-2017-5548, CVE-2017-5551
+ (rhbz 1416096 1416101 1416110 1416126 1416128)
* Wed Jan 25 2017 Justin M. Forbes <jforbes@fedoraproject.org>
- CVE-2017-5576 CVE-2017-5577 vc4 overflows (rhbz 1416436 1416437 1416439)