summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-01-15 07:08:51 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-01-15 07:08:51 +0100
commitc134a1368f261831f59494ef3b899368a0690c39 (patch)
tree1c7042681ffc6118b171da6ba8dfa89f8b21b1aa
parent9799824563c2f98bbe8f45d45087054efda53663 (diff)
parentb491dd4863f13b3c636e8925fc0d20f811d9cf78 (diff)
downloadkernel-c134a1368f261831f59494ef3b899368a0690c39.tar.gz
kernel-c134a1368f261831f59494ef3b899368a0690c39.tar.xz
kernel-c134a1368f261831f59494ef3b899368a0690c39.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc6.git1.1.vanilla.knurd.1.fc31
-rw-r--r--gitrev2
-rw-r--r--kernel.spec8
-rw-r--r--sources1
3 files changed, 8 insertions, 3 deletions
diff --git a/gitrev b/gitrev
index a981d1c4e..892192a60 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-b3a987b0264d3ddbb24293ebff10eddfc472f653
+452424cdcbcaf6a2ebaae4301da5a4e1850a941a
diff --git a/kernel.spec b/kernel.spec
index a01b9591f..eafbff9c3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -112,7 +112,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 5.%{upstream_sublevel}.0
%endif
@@ -205,7 +205,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
%if 0%{?fedora}
# Kernel headers are being split out into a separate package
@@ -2908,6 +2908,10 @@ fi
#
#
%changelog
+* Tue Jan 14 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc6.git1.1
+- Linux v5.5-rc6-27-g452424cdcbca
+- Reenable debugging options.
+
* Mon Jan 13 2020 Justin M. Forbes <jforbes@fedoraproject.org>
- Add Documentation back to kernel-devel as it has Kconfig now (rhbz 1789641)
diff --git a/sources b/sources
index aaa409541..eabf57955 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-5.4.tar.xz) = 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
SHA512 (patch-5.5-rc6.xz) = 3e14b02a2bfaa1cc2b994079c6ae1e20cece2d72184c3b64c9c399a621cdaca77d623204fd35780ccadc23a942a6e8d54a4977423a119771dcbfb3233c09edf2
+SHA512 (patch-5.5-rc6-git1.xz) = 11f31eed90028dbecdacc9546dc79e0f2b628450476eba0a76ebdd82bf20141f332cfffd698ed2b42a32d8c21a2b41ef0b8d09b018ee3baf7df72de445be258e