merge masterkernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc0.git6.1.vanilla.knurd.1.fc24

1 files changed, 27 insertions, 22 deletions

diff --git a/kernel.spec b/kernel.spec
index 00902d984..1f500ee52 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 0
 # The git snapshot level
-%define gitrev 5
+%define gitrev 6
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -504,17 +504,18 @@ Source5000: patch-4.%{base_sublevel}-git%{gitrev}.xz
 %endif
 %endif
 
+## Patches needed for building this package
+
 # build tweak for build ID magic, even for -vanilla
-Source5005: kbuild-AFTER_LINK.patch
+Patch001: kbuild-AFTER_LINK.patch
 
-#ongoing complaint, full discussion delayed until ksummit/plumbers                  
-Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
+## compile fixes
 
-# See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/461597.html
-Patch853: 0001-Work-around-for-gcc7-and-arm64.patch
+# ongoing complaint, full discussion delayed until ksummit/plumbers
+Patch002: 0001-iio-Use-event-header-from-kernel-tree.patch
 
-# compile error
-Patch854: 0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch
+# Still other instances of this bug floating around
+Patch003: 0001-Work-around-for-gcc7-and-arm64.patch
 
 %if !%{nopatches}
 
@@ -609,6 +610,9 @@ Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch
 #CVE-2016-3134 rhbz 1317383 1317384
 Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
 
+#rhbz 1427593
+Patch666: ccm-stack.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -818,7 +822,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\
@@ -1212,24 +1215,13 @@ do
 done
 %endif
 
-# The kbuild-AFTER_LINK patch is needed regardless so we list it as a Source
-# file and apply it separately from the rest.
-git am %{SOURCE5005}
-
-ApplyPatch 0001-iio-Use-event-header-from-kernel-tree.patch
-%if 0%{?fedora} >= 26
-ApplyPatch 0001-Work-around-for-gcc7-and-arm64.patch
-%endif
-ApplyPatch 0001-mm-x86-fix-HIGHMEM64-PARAVIRT-build-config-for-nativ.patch
-
-%if !%{nopatches}
+# Note: Even in the "nopatches" path some patches (build tweaks and compile
+# fixes) will always get applied; see patch defition above for details
 
 git am %{patches}
 
 # END OF PATCH APPLICATIONS
 
-%endif
-
 # Any further pre-build tree manipulations happen here.
 
 chmod +x scripts/checkpatch.pl
@@ -2188,6 +2180,19 @@ fi
 #
 #
 %changelog
+* Tue Feb 28 2017 Laura Abbott <labbott@fedoraproject.org>
+- Fix for yet another stack variable in crypto (rhbz 1427593)
+
+* Tue Feb 28 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git6.1
+- Linux v4.10-10531-g86292b3
+
+* Tue Feb 28 2017 Thorsten Leemhuis <fedora@leemhuis.info>
+- apply patches with build tweaks (build-AFTER-LINK.patch) and compile fixes
+  all the time
+
+* Tue Feb 28 2017 Justin M. Forbes <jforbes@fedoraproject.org> 
+- Fix kernel-devel virtual provide
+
 * Mon Feb 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git5.1
 - Linux v4.10-10320-ge5d56ef
 - Disable a series of s390x configuration options