summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--force-python3-in-kvm_stat.patch22
-rw-r--r--gitrev2
-rw-r--r--kernel.spec11
-rw-r--r--sources1
4 files changed, 8 insertions, 28 deletions
diff --git a/force-python3-in-kvm_stat.patch b/force-python3-in-kvm_stat.patch
deleted file mode 100644
index 38fca1b3c..000000000
--- a/force-python3-in-kvm_stat.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From fc6a72140ef515447743c840674b1aa86b1a4812 Mon Sep 17 00:00:00 2001
-From: Fedora Kernel Team <kernel-team@fedoraproject.org>
-Date: Tue, 25 Jul 2017 12:38:46 -0500
-Subject: [PATCH] Force python3 in kvm_stat
-
----
- tools/kvm/kvm_stat/kvm_stat | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/kvm/kvm_stat/kvm_stat b/tools/kvm/kvm_stat/kvm_stat
-index 8f74ed8..12a8cbb 100755
---- a/tools/kvm/kvm_stat/kvm_stat
-+++ b/tools/kvm/kvm_stat/kvm_stat
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- #
- # top-like utility for displaying kvm statistics
- #
---
-2.9.4
-
diff --git a/gitrev b/gitrev
index e2407ff3a..b0bbf92a6 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-14ccee78fc82f5512908f4424f541549a5705b89
+6470812e22261d2342ef1597be62e63a0423d691
diff --git a/kernel.spec b/kernel.spec
index 94b1c1de3..4ef898d0b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 6
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -125,7 +125,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 %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -529,9 +529,6 @@ Patch002: 0001-iio-Use-event-header-from-kernel-tree.patch
# Standalone patches
# 100 - Generic long running patches
-# Force python3
-Patch105: force-python3-in-kvm_stat.patch
-
Patch110: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch
Patch111: input-kill-stupid-messages.patch
@@ -2205,6 +2202,10 @@ fi
#
#
%changelog
+* Tue Aug 22 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.13.0-0.rc6.git1.1
+- Linux v4.13-rc6-45-g6470812e2226
+- Reenable debugging options.
+
* Tue Aug 22 2017 Peter Robinson <pbrobinson@fedoraproject.org>
- Force python3 for kvm_stat because we can't dep (rhbz 1456722)
diff --git a/sources b/sources
index f0d3c59a4..adb7eb6f9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
SHA512 (perf-man-4.12.tar.gz) = 4d3bbda1f520dba0007c351af46f45085fe4842074eb2e01aee736fd369df595f8f72ed6c1192715f1120bf3353279777f9dca1178fe93bffe5be2de700d409c
SHA512 (linux-4.12.tar.xz) = 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
SHA512 (patch-4.13-rc6.xz) = bc3dbb6c69a663614132c85cf51b0c390d6c8f6f5be4f950ee5425a16c3b929e59e98fd6bc7ea601f7b369af0e9cad4f21276a12707c6c001f500daaafb07860
+SHA512 (patch-4.13-rc6-git1.xz) = ae88493ce927338139c319a78bc1d8b30962acf9b56b364cb6f9203a7ae836c8df4d53e29e4b849b5765a42d2ab306bc84fb05c205291cedfb2ec5d6813dcc56