summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-02-10 19:02:23 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-02-10 19:02:23 +0100
commit72215e11f3849047730df224b7873d2caa81fe42 (patch)
tree994cf0da39b8e35167916d1e0d528e09b6870060 /kernel.spec
parentd062befe5a0cf08237f9f63c85b9dcd272ae2599 (diff)
parent7931e3d890b966ab879c1878b4ed31373298978b (diff)
downloadkernel-72215e11f3849047730df224b7873d2caa81fe42.tar.gz
kernel-72215e11f3849047730df224b7873d2caa81fe42.tar.xz
kernel-72215e11f3849047730df224b7873d2caa81fe42.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec17
1 files changed, 10 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec
index dd0acfe5b..2d07b592b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -823,8 +823,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
-
Patch206: s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
# 300 - ARM patches
@@ -841,8 +839,6 @@ Patch303: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
Patch304: ARM-tegra-usb-no-reset.patch
# Raspberry Pi
-# https://patchwork.kernel.org/cover/11271017/
-Patch310: Raspberry-Pi-4-PCIe-support.patch
# https://patchwork.kernel.org/patch/11299997/
Patch311: bcm283x-gpu-drm-v3d-Add-ARCH_BCM2835-to-DRM_V3D-Kconfig.patch
# https://patchwork.kernel.org/cover/11353083/
@@ -852,10 +848,8 @@ Patch313: usb-xhci-Raspberry-Pi-FW-loader-for-VIA-VL805.patch
# Tegra bits
Patch320: arm64-tegra-jetson-tx1-fixes.patch
-# https://www.spinics.net/lists/linux-tegra/msg43110.html
-Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch
# http://patchwork.ozlabs.org/patch/1230891/
-Patch322: arm64-serial-8250_tegra-Create-Tegra-specific-8250-driver.patch
+Patch321: arm64-serial-8250_tegra-Create-Tegra-specific-8250-driver.patch
# 400 - IBM (ppc/s390x) patches
@@ -2916,6 +2910,15 @@ fi
#
#
%changelog
+* Mon Feb 10 2020 Jeremy Cline <jcline@redhat.com>
+- Remove sysrq support to lift lockdown (rhbz 1800859)
+
+* Mon Feb 10 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc1.git0.1
+- Linux v5.6-rc1
+
+* Mon Feb 10 2020 Jeremy Cline <jcline@redhat.com>
+- Disable debugging options.
+
* Fri Feb 07 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc0.git5.1
- Linux v5.5-9824-g90568ecf5615
- Enable DM_CLONE as a module (rhbz 1799060)