diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-04-05 09:56:20 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-04-05 09:56:20 -0500 |
commit | c918bd768aa916cb376b54354b0753903a1a18b5 (patch) | |
tree | c7dc729ba159d6911082c50347cbf97f244b6be9 /kernel-x86_64-rhel.config | |
parent | dd59893b60ab9fe8e12e16a2941908408a9781ed (diff) | |
download | kernel-c918bd768aa916cb376b54354b0753903a1a18b5.tar.gz kernel-c918bd768aa916cb376b54354b0753903a1a18b5.tar.xz kernel-c918bd768aa916cb376b54354b0753903a1a18b5.zip |
kernel-5.12.0-0.rc5.20210331git2bb25b3a748a.181
* Wed Mar 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [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 <jforbes@fedoraproject.org>
Diffstat (limited to 'kernel-x86_64-rhel.config')
-rw-r--r-- | kernel-x86_64-rhel.config | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 1f40cc183..efffd6687 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -224,7 +224,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 @@ -6527,7 +6526,7 @@ CONFIG_X86_PAT=y # CONFIG_X86_PCC_CPUFREQ is not set CONFIG_X86_PKG_TEMP_THERMAL=m CONFIG_X86_PLATFORM_DEVICES=y -# CONFIG_X86_PLATFORM_DRIVERS_DELL is not set +CONFIG_X86_PLATFORM_DRIVERS_DELL=y CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY=m CONFIG_X86_PM_TIMER=y |