merge originkernel-4.9.14-100.vanilla.knurd.1.fc24

1 files changed, 34 insertions, 9 deletions

diff --git a/kernel.spec b/kernel.spec
index e02431905..4e3db84ad 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -59,7 +59,8 @@ Summary: The Linux kernel
 
 
 # Do we have a -stable update to apply?
-%define stable_update 13
+%define stable_update 14
+
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -531,8 +532,6 @@ Patch426: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
 # Fix OMAP4 (pandaboard)
 Patch427: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch
 
-Patch428: arm64-dma-mapping-Fix-dma_mapping_error-when-bypassing-SWIOTLB.patch
-
 # Not particularly happy we don't yet have a proper upstream resolution this is the right direction
 # https://www.spinics.net/lists/arm-kernel/msg535191.html
 Patch429: arm64-mm-Fix-memmap-to-be-initialized-for-the-entire-section.patch
@@ -549,6 +548,8 @@ Patch433: bcm283x-mmc-imp-speed.patch
 
 Patch434: mm-alloc_contig-re-allow-CMA-to-compact-FS-pages.patch
 
+Patch436: vc4-fix-vblank-cursor-update-issue.patch
+
 Patch440: AllWinner-net-emac.patch
 
 Patch442: ARM-Drop-fixed-200-Hz-timer-requirement-from-Samsung-platforms.patch
@@ -658,14 +659,14 @@ Patch855: kvm-fix-page-struct-leak-in-handle_vmon.patch
 Patch858: 1-2-media-cxusb-Use-a-dma-capable-buffer-also-for-reading.patch
 Patch859: 2-2-media-dvb-usb-firmware-don-t-do-DMA-on-stack.patch
 
-#rhbz 1415397
-Patch861: w1-ds2490-USB-transfer-buffers-need-to-be-DMAable.patch
-
 #rhbz 1422969
 Patch862: rt2800-warning.patch
 
-#CVE-2017-6074
-Patch863: dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch
+#CVE-2017-6353 rhbz 1428907 1428910
+Patch864: sctp-deny-peeloff-operation-on-asocs-with-threads-sl.patch
+
+# CVE-2017-2636 rhbz 1430049
+Patch668: 0001-tty-n_hdlc-get-rid-of-racy-n_hdlc.tbuf.patch
 
 # END OF PATCH DEFINITIONS
 
@@ -876,7 +877,6 @@ Summary: Development package for building kernel modules to match the %{?2:%{2}
 Group: System Environment/Kernel\
 Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
 Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
-Provides: kernel-devel = %{version}-%{release}%{?1:+%{1}}\
 Provides: kernel-devel-uname-r = %{KVERREL}%{?variant}%{?1:+%{1}}\
 Provides: installonlypkg(kernel)\
 AutoReqProv: no\
@@ -2199,6 +2199,31 @@ fi
 #
 # 
 %changelog
+* Mon Mar 13 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.14-100
+- Linux v4.9.14
+
+* Tue Mar 07 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.13-101
+- Build for some CVEs
+
+* Tue Mar 07 2017 Laura Abbott <labbott@fedoraproject.org>
+- CVE-2017-2636 Race condition access to n_hdlc.tbuf causes double free in n_hdlc_release (rhbz 1430049)
+
+* Tue Mar  7 2017 Laura Abbott <labbott@redhat.com>
+- Disable CONFIG_IWLWIFI_PCIE_RTPM (rhbz 1429135)
+
+* Mon Mar  6 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- CVE-2017-6353 Possible double free in stcp_sendmsg (rhbz 1428907 1428910)
+
+* Wed Mar  1 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add patch to fix desktop lockups on RPi (vc4) RHBZ# 1389163
+
+* Tue Feb 28 2017 Justin M. Forbes <jforbes@fedoraproject.org>
+- CVE-2017-5669 shmat allows mmap null page protection bypass (rhbz 1427239)
+- Fix kernel-devel virtual provide
+
+* Mon Feb 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.13-100
+- Linux v4.9.13
+
 * Thu Feb 23 2017 Laura Abbott <labbott@fedoraproject.org> - 4.9.12-100
 - Linux v4.9.12