summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2016-09-14 22:41:09 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2016-09-14 22:41:09 +0200
commita72d7507a2ba3d7952e52cf87d1e31492ef091fe (patch)
tree734fbb5522e111833fe64c6e36becf00c423b369 /kernel.spec
parent2d19a7b55a9522e6e548dfe4c4afad82b9cec293 (diff)
parent5c4f69525affb6809bedbf679fc3bf86b595d4fa (diff)
downloadkernel-a72d7507a2ba3d7952e52cf87d1e31492ef091fe.tar.gz
kernel-a72d7507a2ba3d7952e52cf87d1e31492ef091fe.tar.xz
kernel-a72d7507a2ba3d7952e52cf87d1e31492ef091fe.zip
Merge remote-tracking branch 'origin/master'kernel-4.8.0-0.rc6.git2.1.vanilla.knurd.1.fc23
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec21
1 files changed, 19 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 10b9eb32e..d74b6fd78 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 6
# The git snapshot level
-%define gitrev 0
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -133,7 +133,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# Want to build a vanilla kernel build without any non-upstream patches?
%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -628,6 +628,12 @@ Patch846: security-selinux-overlayfs-support.patch
#rhbz 1360688
Patch847: rc-core-fix-repeat-events.patch
+#rhbz 1374212
+Patch848: 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch
+
+#ongoing complaint, full discussion delayed until ksummit/plumbers
+Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -2167,6 +2173,17 @@ fi
#
#
%changelog
+* Wed Sep 14 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc6.git2.1
+- Linux v4.8-rc6-211-g77e5bdf
+
+* Wed Sep 14 2016 Laura Abbott <labbott@fedoraproject.org>
+- Fix for incorrect return checking in cpupower (rhbz 1374212)
+- Let iio tools build on older kernels
+
+* Tue Sep 13 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc6.git1.1
+- Linux v4.8-rc6-147-ge8988e0
+- Reenable debugging options.
+
* Mon Sep 12 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc6.git0.1
- Linux v4.8-rc6
- Disable debugging options.