summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-07-09 18:51:39 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2018-07-09 18:51:39 +0200
commit88053ebd48449674846aa52e00af7f1531b748a4 (patch)
treeb097ed90780d4eaad7f919724385c4e8b3f00bc8 /kernel.spec
parente3975f20fa6ed47d8fd7a1222fc7d1050aa26a91 (diff)
parentf145a6184076bf6225564af092e41bd753aecfae (diff)
downloadkernel-88053ebd48449674846aa52e00af7f1531b748a4.tar.gz
kernel-88053ebd48449674846aa52e00af7f1531b748a4.tar.xz
kernel-88053ebd48449674846aa52e00af7f1531b748a4.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec13
1 files changed, 12 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index dc43fbe2e..e9027b87b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 3
# The git snapshot level
-%define gitrev 2
+%define gitrev 3
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -606,6 +606,11 @@ Patch330: bcm2837-enable-pmu.patch
Patch332: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
+# Fix for AllWinner A64 Timer Errata, still not final
+# https://patchwork.kernel.org/patch/10392891/
+Patch350: arm64-arch_timer-Workaround-for-Allwinner-A64-timer-instability.patch
+Patch351: arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch
+
# 400 - IBM (ppc/s390x) patches
# 500 - Temp fixes/CVEs etc
@@ -1857,6 +1862,12 @@ fi
#
#
%changelog
+* Mon Jul 9 2018 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add fix for AllWinner A64 timer scew errata
+
+* Fri Jul 06 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc3.git3.1
+- Linux v4.18-rc3-183-gc42c12a90545
+
* Thu Jul 05 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc3.git2.1
- Linux v4.18-rc3-134-g06c85639897c