summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-02-27 18:59:14 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2017-02-27 18:59:14 +0100
commit9dadb8016b93b029ff9fc611c44236f837aad1c3 (patch)
treee57fcc3f53d3e5be7846cf9760e8e46bf656004f /kernel.spec
parent2401e082a40d46b7342876fc41e8b3c7f8cef798 (diff)
parentace9a4db5b7ff0a7b0df7c34763667628f168e09 (diff)
downloadkernel-9dadb8016b93b029ff9fc611c44236f837aad1c3.tar.gz
kernel-9dadb8016b93b029ff9fc611c44236f837aad1c3.tar.xz
kernel-9dadb8016b93b029ff9fc611c44236f837aad1c3.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 0a0b9bb6b..0639e72b5 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 4
+%define gitrev 5
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -546,10 +546,6 @@ Patch430: bcm2837-initial-support.patch
# http://www.spinics.net/lists/dri-devel/msg132235.html
Patch433: drm-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO..patch
-# Fix RPi3 from crashing. Nowhere near a final fix but provides breathing room while that is sorted
-# https://github.com/anholt/linux/issues/89
-Patch434: 0001-i2c-bcm2835-Debug-test-for-curr_msg.patch
-
# Upstream fixes for i2c/serial/ethernet MAC addresses
Patch435: bcm283x-fixes.patch
@@ -2188,6 +2184,10 @@ fi
#
#
%changelog
+* Mon Feb 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git5.1
+- Linux v4.10-10320-ge5d56ef
+- Disable a series of s390x configuration options
+
* Fri Feb 24 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git4.1
- Linux v4.10-9579-gf1ef09f