From c918bd768aa916cb376b54354b0753903a1a18b5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 5 Apr 2021 09:56:20 -0500 Subject: kernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181 * Wed Mar 31 2021 Fedora Kernel Team [5.12.0-0.rc5.20210331git2bb25b3a748a.181] - configs/common/generic: disable CONFIG_SLAB_MERGE_DEFAULT (Rafael Aquini) - Remove _legacy_common_support (Justin M. Forbes) - redhat/mod-blacklist.sh: Fix floppy blacklisting (Hans de Goede) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel-s390x-rhel.config | 2 -- 1 file changed, 2 deletions(-) (limited to 'kernel-s390x-rhel.config') diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index cbfac0e68..baee453e0 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -200,7 +200,6 @@ CONFIG_ARCH_RANDOM=y # CONFIG_ARCH_SYNQUACER is not set # CONFIG_ARCNET is not set CONFIG_ARM64_AMU_EXTN=y -CONFIG_ARM64_BTI=y CONFIG_ARM64_E0PD=y CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y @@ -6225,7 +6224,6 @@ CONFIG_WMI_BMOF=m # CONFIG_X25 is not set CONFIG_X86_AMD_PLATFORM_DEVICE=y CONFIG_X86_IOPL_IOPERM=y -# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY=m CONFIG_XDP_SOCKETS_DIAG=m -- cgit