summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-02-24 08:49:39 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2017-02-24 08:49:39 +0100
commit7a6128abcabd8c8feedd248c5f2f8dc801c9f38a (patch)
tree73c2ac971c2e74540535459fc3678d28e24c1f8c
parent0561c2af383a538203d770ba7b260212565460ef (diff)
downloadkernel-7a6128abcabd8c8feedd248c5f2f8dc801c9f38a.tar.gz
kernel-7a6128abcabd8c8feedd248c5f2f8dc801c9f38a.tar.xz
kernel-7a6128abcabd8c8feedd248c5f2f8dc801c9f38a.zip
-rw-r--r--kernel.spec7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 90c773ba3..b910d42f1 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
+#ongoing complaint, full discussion delayed until ksummit/plumbers
+Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
+
# See http://lists.infradead.org/pipermail/linux-arm-kernel/2016-October/461597.html
Patch853: 0001-Work-around-for-gcc7-and-arm64.patch
@@ -609,9 +612,6 @@ 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
-#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
@@ -1222,6 +1222,7 @@ done
# 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