summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-05-11 07:32:40 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-05-11 07:32:40 +0200
commitcf0f4cc963bf4cb90aa3b2e6da9625635f51ca81 (patch)
tree8e64921ffe9ffe2c3d5f1d846a9c17d3c446d41b /kernel.spec
parent4e77b4ddfa12a299a7db917d0bd0235c7b802f6d (diff)
parent70ef9fe7fb71d8d9aa9ce7cfd6e0e4d812860d46 (diff)
downloadkernel-cf0f4cc963bf4cb90aa3b2e6da9625635f51ca81.tar.gz
kernel-cf0f4cc963bf4cb90aa3b2e6da9625635f51ca81.tar.xz
kernel-cf0f4cc963bf4cb90aa3b2e6da9625635f51ca81.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc4.git3.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc4.git3.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 10 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 0cdedc7f3..2a52a2d74 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 4
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -611,6 +611,9 @@ Patch311: arm-dts-Add-am335x-pocketbeagle.patch
# https://www.spinics.net/lists/linux-tegra/msg32920.html
Patch312: arm-tegra-USB-driver-dependency-fix.patch
+# rhbz 1574718
+Patch313: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
+
# https://patchwork.kernel.org/patch/10354521/
# https://patchwork.kernel.org/patch/10354187/
# https://patchwork.kernel.org/patch/10306793/
@@ -1892,6 +1895,12 @@ fi
#
#
%changelog
+* Thu May 10 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git3.1
+- Linux v4.17-rc4-38-g008464a9360e
+
+* Wed May 09 2018 Jeremy Cline <jeremy@jcline.org>
+- Workaround for m400 uart irq firmware description (rhbz 1574718)
+
* Wed May 09 2018 Justin M. Forbes <jforbes@fedoraproject.org> - 4.17.0-0.rc4.git2.1
- Linux v4.17-rc4-31-g036db8bd9637