Linux v4.10.9

3 files changed, 6 insertions, 25 deletions

diff --git a/Armada-trace-build-fix.patch b/Armada-trace-build-fix.patch
deleted file mode 100644
index f78b121c0..000000000
--- a/Armada-trace-build-fix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Fedora Kernel Team <kernel-team@fedoraproject.org>
-Date: Wed, 14 Dec 2016 16:53:21 -0600
-Subject: [PATCH] Armada trace build fix
-
----
- drivers/gpu/drm/armada/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/gpu/drm/armada/Makefile b/drivers/gpu/drm/armada/Makefile
---- a/drivers/gpu/drm/armada/Makefile
-+++ b/drivers/gpu/drm/armada/Makefile
-@@ -4,3 +4,5 @@ armada-y	+= armada_510.o
- armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
-
- obj-$(CONFIG_DRM_ARMADA) := armada.o
-+
-+CFLAGS_armada_trace.o := -I$(src)
--- 
-2.9.3
-
diff --git a/kernel.spec b/kernel.spec
index 0cdbc70ab..5bca2fa56 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 8
+%define stable_update 9
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -596,9 +596,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 #ongoing complaint, full discussion delayed until ksummit/plumbers
 Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
 
-# Fix build issue with armada_trace
-Patch851: Armada-trace-build-fix.patch
-
 # selinux: allow context mounts on tmpfs, ramfs, devpts within user namespaces
 Patch852: selinux-allow-context-mounts-on-tmpfs-etc.patch
 
@@ -2188,6 +2185,10 @@ fi
 #
 # 
 %changelog
+* Mon Apr 10 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.9-100
+- Linux v4.10.9
+- CVE-2017-7187 (rhbz 1434327 1439045)
+
 * Wed Apr 05 2017 Justin M. Forbes <jforbes@fedoraproject.org>
 - Don't print MCEs when mcelog is running (rhbz 1438316)
 - CVE-2017-2671 Fix ping locking (rhbz 1436649 1436663)
diff --git a/sources b/sources
index 43a3e833f..e6820718f 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.10.tar.xz) = c3690125a8402df638095bd98a613fcf1a257b81de7611c84711d315cd11e2634ab4636302b3742aedf1e3ba9ce0fea53fe8c7d48e37865d8ee5db3565220d90
 SHA512 (perf-man-4.10.tar.gz) = 2c830e06f47211d70a8330961487af73a8bc01073019475e6b6131d3bb8c95658b77ca0ae5f1b44371accf103658bc5a3a4366b3e017a4088a8fd408dd6867e8
-SHA512 (patch-4.10.8.xz) = 9760254a63fea330e33b514dda457a3bf33da6f8e06c281fc3fb36ba4c022df8200d2a04d49f4acc9ce0c9f86cbfda7edc724431ed378be3288eb299510add2e
+SHA512 (patch-4.10.9.xz) = 867cdcf1e6ceee58dec7eb913e119dcaa75255cef1ad2dd9eb0eead6a918a202e3b6656770422d547a7758236a8589c70d49fa4045de867b77a04480f97c242d