summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-01-14 06:32:04 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-01-14 06:32:04 +0100
commit6f9bc72e6d1ba321283b8ca8e247bb794f9619b2 (patch)
treeccff112c66b740b417187a16cb69f3eb5cbf3e1b /kernel.spec
parent085f00a1638f211d3c7fd0a3f8e50d453c1a4dc7 (diff)
parenta443bcbf915cc5797ae3d950ee6c26b71e57e92e (diff)
downloadkernel-6f9bc72e6d1ba321283b8ca8e247bb794f9619b2.tar.gz
kernel-6f9bc72e6d1ba321283b8ca8e247bb794f9619b2.tar.xz
kernel-6f9bc72e6d1ba321283b8ca8e247bb794f9619b2.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec15
1 files changed, 14 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index ace765546..888a92ca1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -819,6 +819,8 @@ Patch204: efi-secureboot.patch
Patch205: lift-lockdown-sysrq.patch
+Patch206: s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
+
# 300 - ARM patches
Patch300: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
@@ -871,6 +873,9 @@ Patch505: ARM-fix-__get_user_check-in-case-uaccess_-calls-are-not-inlined.patch
# CVE-2019-14897 rhbz 1774879 1776146
Patch526: libertas-Fix-two-buffer-overflows-at-parsing-bss-descriptor.patch
+# ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support)
+Patch527: alsa-5.6.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1949,7 +1954,6 @@ BuildKernel() {
%endif
# then drop all but the needed Makefiles/Kconfig files
- rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/Documentation
rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/scripts
rm -rf $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/include
cp .config $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
@@ -2909,6 +2913,15 @@ fi
#
#
%changelog
+* Mon Jan 13 2020 Justin M. Forbes <jforbes@fedoraproject.org>
+- Add Documentation back to kernel-devel as it has Kconfig now (rhbz 1789641)
+
+* Mon Jan 13 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc6.git0.1
+- Linux v5.5-rc6
+
+* Mon Jan 13 2020 Justin M. Forbes <jforbes@fedoraproject.org>
+- Disable debugging options.
+
* Fri Jan 10 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-0.rc5.git3.1
- Linux v5.5-rc5-215-g4e4cd21c64da