summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-06-29 18:19:32 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2017-06-29 18:19:32 +0200
commitf89d0ae26f006e22d164c340dac00c3cb9efeab5 (patch)
tree2565d5fc61c1e5d566d8c22385093a5ba0a6682c /kernel.spec
parent8e09a750c28f3ad6b489d7ec4bb97362a2939bf4 (diff)
parent5929f0247b00a9a5e8a9c4ffe6fe1968c2d2d06c (diff)
downloadkernel-f89d0ae26f006e22d164c340dac00c3cb9efeab5.tar.gz
kernel-f89d0ae26f006e22d164c340dac00c3cb9efeab5.tar.xz
kernel-f89d0ae26f006e22d164c340dac00c3cb9efeab5.zip
Merge remote-tracking branch 'origin/master'
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 2297e4287..b902e99a9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 7
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -626,6 +626,10 @@ Patch314: bcm2835-fix-potential-null-pointer-dereferences.patch
# https://patchwork.freedesktop.org/patch/161978/
Patch315: bcm283x-vc4-fix-vblank.patch
+# https://patchwork.kernel.org/patch/9815555/
+# https://patchwork.kernel.org/patch/9815651/
+Patch316: qcom-rmsg-spmi-fixes.patch
+
# 400 - IBM (ppc/s390x) patches
# 500 - Temp fixes/CVEs etc
@@ -2213,6 +2217,13 @@ fi
#
#
%changelog
+* Thu Jun 29 2017 Laura Abbott <labbott@fedoraproject.org> - 4.12.0-0.rc7.git2.1
+- Linux v4.12-rc7-25-g6474924
+
+* Wed Jun 28 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Tweak vc4 vblank for stability
+- Fix for early boot on Dragonboard 410c
+
* Tue Jun 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.12.0-0.rc7.git1.1
- Linux v4.12-rc7-8-g3c2bfba