diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-25 19:13:32 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-02-25 19:13:32 +0100 |
commit | 8415ddbca0ade49ace794fdb75461a175cd55918 (patch) | |
tree | a599baee1d049b8327cd73039e30308c7a92627a /kernel-aarch64-fedora.config | |
parent | e661d91eb909e777a9d28425ef50fcc5ef7fa5ed (diff) | |
parent | 6d8c0161ad69a5d261779ab2ecd265d8352939f0 (diff) | |
download | kernel-8415ddbca0ade49ace794fdb75461a175cd55918.tar.gz kernel-8415ddbca0ade49ace794fdb75461a175cd55918.tar.xz kernel-8415ddbca0ade49ace794fdb75461a175cd55918.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc5.20220225git53ab78cd6d5a.106.vanilla.1.fc37kernel-5.17.0-0.rc5.20220225git53ab78cd6d5a.106.vanilla.1.fc36kernel-5.17.0-0.rc5.20220225git53ab78cd6d5a.106.vanilla.1.fc35kernel-5.17.0-0.rc5.20220225git53ab78cd6d5a.106.vanilla.1.fc34
Diffstat (limited to 'kernel-aarch64-fedora.config')
-rw-r--r-- | kernel-aarch64-fedora.config | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 3e24d16aa..682008803 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1561,7 +1561,9 @@ CONFIG_DELL_WMI_SYSMAN=m # CONFIG_DEV_APPLETALK is not set CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m +CONFIG_DEV_DAX=m # CONFIG_DEV_DAX_PMEM_COMPAT is not set +CONFIG_DEV_DAX_PMEM=m CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m CONFIG_DEVFREQ_GOV_PASSIVE=m CONFIG_DEVFREQ_GOV_PERFORMANCE=m @@ -6859,7 +6861,6 @@ CONFIG_SND_SOC_IMX_SPDIF=m # CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH is not set -# CONFIG_SND_SOC_INTEL_SOF_NAU8825_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH is not set # CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH is not set @@ -7678,7 +7679,8 @@ CONFIG_TRACE_EVAL_MAP_FILE=y # CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set CONFIG_TRACER_SNAPSHOT=y # CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set -# CONFIG_TRANSPARENT_HUGEPAGE is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRUSTED_FOUNDATIONS=y CONFIG_TRUSTED_KEYS=y # CONFIG_TS4800_IRQ is not set |