summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-03-02 07:11:48 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2017-03-02 07:11:48 +0100
commit6c1f95521905c276119057698934aa59e19893a3 (patch)
tree9451eea0d9b379bdda09cd54208e54a2a60d4bfa /kernel.spec
parent1126dddbf48bbd892d5c63675058328cf92fa94f (diff)
parente582bbd7279dcc29b7458459592db49095b931c3 (diff)
downloadkernel-6c1f95521905c276119057698934aa59e19893a3.tar.gz
kernel-6c1f95521905c276119057698934aa59e19893a3.tar.xz
kernel-6c1f95521905c276119057698934aa59e19893a3.zip
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc0.git7.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec20
1 files changed, 19 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 1f500ee52..da4ee4c18 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 6
+%define gitrev 7
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -553,6 +553,9 @@ Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..pa
# Upstream fixes for i2c/serial/ethernet MAC addresses
Patch435: bcm283x-fixes.patch
+# https://lists.freedesktop.org/archives/dri-devel/2017-February/133823.html
+Patch436: vc4-fix-vblank-cursor-update-issue.patch
+
# http://www.spinics.net/lists/arm-kernel/msg552554.html
Patch438: arm-imx6-hummingboard2.patch
@@ -613,6 +616,12 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
#rhbz 1427593
Patch666: ccm-stack.patch
+# grabbed from mailing list
+Patch667: v3-Revert-tty-serial-pl011-add-ttyAMA-for-matching-pl011-console.patch
+
+# reported via IRC
+Patch668: objtool-fix.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2180,6 +2189,15 @@ fi
#
#
%changelog
+* Wed Mar 01 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git7.1
+- Linux v4.10-10770-g2d6be4a
+
+* Wed Mar 1 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Enable Tiny DRM on ARM platforms
+- ARM config updates
+- General config cleanups
+- Add patch to fix desktop lockups on RPi (vc4) RHBZ# 1389163
+
* Tue Feb 28 2017 Laura Abbott <labbott@fedoraproject.org>
- Fix for yet another stack variable in crypto (rhbz 1427593)