diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-31 17:42:24 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-10-31 17:42:24 +0100 |
commit | 282dd29bc205f935681343a282c3898d8c019db4 (patch) | |
tree | 7dde1cc1d2909b4165bcead963b4fc333d14b414 /kernel-s390x-rhel.config | |
parent | 92254746699f086972351228a952ed3f6bf8e4fd (diff) | |
parent | e47cadcd9c80ec938c7b744d4296f42ce0fabc75 (diff) | |
download | kernel-282dd29bc205f935681343a282c3898d8c019db4.tar.gz kernel-282dd29bc205f935681343a282c3898d8c019db4.tar.xz kernel-282dd29bc205f935681343a282c3898d8c019db4.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.1.0-0.rc3.27.vanilla.1.fc38kernel-6.1.0-0.rc3.27.vanilla.1.fc37kernel-6.1.0-0.rc3.27.vanilla.1.fc36kernel-6.1.0-0.rc3.27.vanilla.1.fc35
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index d3a4d400a..5fc4ebc75 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1158,6 +1158,7 @@ CONFIG_DMABUF_MOVE_NOTIFY=y CONFIG_DMA_ENGINE=y # CONFIG_DMA_FENCE_TRACE is not set # CONFIG_DMA_MAP_BENCHMARK is not set +# CONFIG_DMA_PERNUMA_CMA: # CONFIG_DMA_PERNUMA_CMA is not set # CONFIG_DMARD06 is not set # CONFIG_DMARD09 is not set @@ -2319,7 +2320,6 @@ CONFIG_INTEL_SDSI=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_TCC_COOLING is not set -CONFIG_INTEL_TDX_GUEST=y # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m @@ -2587,6 +2587,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set # CONFIG_KERNEL_ZSTD is not set CONFIG_KEXEC_FILE=y +# CONFIG_KEXEC_IMAGE_VERIFY_SIG: CONFIG_KEXEC_IMAGE_VERIFY_SIG=y # CONFIG_KEXEC_SIG_FORCE is not set CONFIG_KEXEC_SIG=y @@ -3759,6 +3760,7 @@ CONFIG_N_GSM=m # CONFIG_NI903X_WDT is not set # CONFIG_NIC7018_WDT is not set # CONFIG_NILFS2_FS is not set +# CONFIG_NITRO_ENCLAVES: CONFIG_NITRO_ENCLAVES=m CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y # CONFIG_NL80211_TESTMODE is not set @@ -5257,6 +5259,7 @@ CONFIG_SND_INDIGOIOX=m CONFIG_SND_INDIGO=m # CONFIG_SND_INTEL8X0 is not set # CONFIG_SND_INTEL8X0M is not set +# CONFIG_SND_INTEL_BYT_PREFER_SOF: # CONFIG_SND_INTEL_BYT_PREFER_SOF is not set CONFIG_SND_ISIGHT=m # CONFIG_SND_JACK_INJECTION_DEBUG is not set @@ -5575,11 +5578,13 @@ CONFIG_SND_SOC_MAX98927=m # CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811 is not set # CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF is not set # CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994 is not set +# CONFIG_SND_SOC_SC7180: # CONFIG_SND_SOC_SC7180 is not set # CONFIG_SND_SOC_SDM845 is not set # CONFIG_SND_SOC_SGTL5000 is not set # CONFIG_SND_SOC_SIMPLE_AMPLIFIER is not set # CONFIG_SND_SOC_SIMPLE_MUX is not set +# CONFIG_SND_SOC_SM8250: # CONFIG_SND_SOC_SM8250 is not set # CONFIG_SND_SOC_SMDK_WM8994_PCM is not set # CONFIG_SND_SOC_SNOW is not set @@ -6804,6 +6809,7 @@ CONFIG_WATCH_QUEUE=y # CONFIG_WINMATE_FM07_KEYS is not set # CONFIG_WIREGUARD_DEBUG is not set CONFIG_WIREGUARD=m +# CONFIG_WIRELESS_HOTKEY: CONFIG_WIRELESS_HOTKEY=m CONFIG_WIRELESS=y # CONFIG_WLAN_VENDOR_ADMTEK is not set @@ -6884,8 +6890,12 @@ CONFIG_XILINX_GMII2RGMII=m # CONFIG_XILLYBUS is not set # CONFIG_XILLYUSB is not set CONFIG_XMON_DEFAULT_RO_MODE=y +# CONFIG_XZ_DEC_ARM ignored for predicate CONFIG_EXPERT +# CONFIG_XZ_DEC_ARMTHUMB ignored for predicate CONFIG_EXPERT +# CONFIG_XZ_DEC_IA64 ignored for predicate CONFIG_EXPERT # CONFIG_XZ_DEC_MICROLZMA is not set CONFIG_XZ_DEC_POWERPC=y +# CONFIG_XZ_DEC_SPARC ignored for predicate CONFIG_EXPERT # CONFIG_XZ_DEC_TEST is not set CONFIG_XZ_DEC_X86=y CONFIG_XZ_DEC=y |