summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-03-27 17:56:24 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-03-27 17:56:24 +0100
commit5e2ea00b0d31406f254f538472f30484dfd923a8 (patch)
tree66aee3ae71cc0162fb456d85c63329506db03a4b /kernel.spec
parent62bc294947de1267ccbee8a7021626895a8e22e6 (diff)
parent0502703eff94827ef699505b6a804d30da027bc9 (diff)
downloadkernel-5e2ea00b0d31406f254f538472f30484dfd923a8.tar.gz
kernel-5e2ea00b0d31406f254f538472f30484dfd923a8.tar.xz
kernel-5e2ea00b0d31406f254f538472f30484dfd923a8.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.6.0-0.rc7.git1.1.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index b245d744d..56449d628 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -115,7 +115,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 7
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -208,7 +208,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
@@ -857,6 +857,8 @@ Patch323: arm64-tegra-fix-pcie.patch
Patch324: regulator-pwm-Don-t-warn-on-probe-deferral.patch
# http://patchwork.ozlabs.org/patch/1243112/
Patch325: backlight-lp855x-Ensure-regulators-are-disabled-on-probe-failure.patch
+# https://patchwork.ozlabs.org/patch/1261638/
+Patch326: arm64-drm-tegra-Fix-SMMU-support-on-Tegra124-and-Tegra210.patch
# Coral
Patch330: arm64-dts-imx8mq-phanbell-Add-support-for-ethernet.patch
@@ -3002,6 +3004,12 @@ fi
#
#
%changelog
+* Fri Mar 27 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc7.git1.1
+- Linux v5.6-rc7-227-gf3e69428b5e2
+
+* Fri Mar 27 2020 Jeremy Cline <jcline@redhat.com>
+- Reenable debugging options.
+
* Mon Mar 23 2020 Peter Robinson <pbrobinson@gmail.com> - 5.6.0-0.rc7.git0.1
- Linux v5.6-rc7