summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-02-11 13:45:44 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-02-11 13:45:44 +0100
commit5ca6a50dd3bac49de841d28306fc86e1019c896b (patch)
tree6bb091875bea7c4fd70e4a20c4e7095d5cb048c8 /kernel.spec
parent48d2ea1892fb00405dd817b212cff4e821f6b881 (diff)
parentd7d00d12af89d70ff64ba9f4ecf3691c7b8a9453 (diff)
downloadkernel-5ca6a50dd3bac49de841d28306fc86e1019c896b.tar.gz
kernel-5ca6a50dd3bac49de841d28306fc86e1019c896b.tar.xz
kernel-5ca6a50dd3bac49de841d28306fc86e1019c896b.zip
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index dad0bfa55..30228b97f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -771,8 +771,6 @@ Patch202: 0003-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch
Patch204: efi-secureboot.patch
-Patch205: lift-lockdown-sysrq.patch
-
# 300 - ARM patches
Patch300: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
@@ -2540,6 +2538,9 @@ fi
#
#
%changelog
+* Mon Feb 10 2020 Jeremy Cline <jcline@redhat.com>
+- Remove sysrq support to lift lockdown (rhbz 1800859)
+
* Thu Feb 06 2020 Jeremy Cline <jcline@redhat.com> - 5.4.18-200
- Linux v5.4.18