summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-02-11 14:41:52 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2017-02-11 14:41:52 +0100
commit3db62e45179875f23e25bcc6fe088bb6b264ea0b (patch)
tree445ed77435429399b36ffb612f45cb6fac20eb2f
parenta9501d88ab53baf502ea65cbdc933eb7e556e81b (diff)
downloadkernel-3db62e45179875f23e25bcc6fe088bb6b264ea0b.tar.gz
kernel-3db62e45179875f23e25bcc6fe088bb6b264ea0b.tar.xz
kernel-3db62e45179875f23e25bcc6fe088bb6b264ea0b.zip
-rw-r--r--kernel.spec10
1 files changed, 7 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 0e11be926..9b2c90d00 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -507,6 +507,9 @@ Source5000: patch-4.%{base_sublevel}-git%{gitrev}.xz
# build tweak for build ID magic, even for -vanilla
Source5005: kbuild-AFTER_LINK.patch
+# See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/461597.html
+Patch853: 0001-Work-around-for-gcc7-and-arm64.patch
+
%if !%{nopatches}
# Git trees.
@@ -613,9 +616,6 @@ 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
-# See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/461597.html
-Patch853: 0001-Work-around-for-gcc7-and-arm64.patch
-
#CVE-2017-2596 rhbz 1417812 1417813
Patch854: kvm-fix-page-struct-leak-in-handle_vmon.patch
@@ -1226,6 +1226,10 @@ done
# file and apply it separately from the rest.
git am %{SOURCE5005}
+%if 0%{?fedora} >= 26
+ApplyPatch 0001-Work-around-for-gcc7-and-arm64.patch
+%endif
+
%if !%{nopatches}
git am %{patches}