diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-07 10:17:15 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-09-07 10:17:15 +0200 |
commit | 963391f8de309bc487244ebda2b69d976f323463 (patch) | |
tree | 4eb6eb326400be42616204ce3ffa551784a3a6a4 /kernel-s390x-rhel.config | |
parent | f3ab93fe13027d2bfeaa0d69c382f0901fff814f (diff) | |
parent | eb5b7c9ef820e1ead25a45d25ba242c5f170388a (diff) | |
download | kernel-963391f8de309bc487244ebda2b69d976f323463.tar.gz kernel-963391f8de309bc487244ebda2b69d976f323463.tar.xz kernel-963391f8de309bc487244ebda2b69d976f323463.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-0.rc4.20220906git53e99dcff61e.32.vanilla.1.fc36
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index a24f27dc2..383165019 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -792,7 +792,6 @@ CONFIG_CONNECTOR=y CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 CONFIG_CONSOLE_LOGLEVEL_QUIET=4 CONFIG_CONTEXT_SWITCH_TRACER=y -# CONFIG_CONTEXT_TRACKING_FORCE is not set # CONFIG_CONTEXT_TRACKING_USER_FORCE is not set CONFIG_CORDIC=m CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y @@ -4148,7 +4147,6 @@ CONFIG_PROTECTED_VIRTUALIZATION_GUEST=y CONFIG_PROVE_NVDIMM_LOCKING=y # CONFIG_PROVE_RAW_LOCK_NESTING is not set CONFIG_PSAMPLE=m -# CONFIG_PSERIES_PLPKS is not set CONFIG_PSI_DEFAULT_DISABLED=y CONFIG_PSI=y # CONFIG_PSTORE_842_COMPRESS is not set |