diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-04 07:53:12 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-04 07:53:12 +0200 |
commit | 981cd1ae7d9f83e7eb2b49ec116a60c2844388fd (patch) | |
tree | 06f5c94298924c84d90bda6e00feda3fa366ded6 /kernel-s390x-zfcpdump-rhel.config | |
parent | 323cdafa8018cd318c6156cc0b7ec1317a93a406 (diff) | |
parent | 931af94c6888d2e5664ba2a1c077c24a2c889728 (diff) | |
download | kernel-981cd1ae7d9f83e7eb2b49ec116a60c2844388fd.tar.gz kernel-981cd1ae7d9f83e7eb2b49ec116a60c2844388fd.tar.xz kernel-981cd1ae7d9f83e7eb2b49ec116a60c2844388fd.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc4.36.vanilla.1.fc35kernel-5.14.0-0.rc4.36.vanilla.1.fc34kernel-5.14.0-0.rc4.36.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r-- | kernel-s390x-zfcpdump-rhel.config | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 73b642903..48744647b 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3801,7 +3801,7 @@ CONFIG_OPROFILE=m CONFIG_OPTIMIZE_INLINING=y # CONFIG_ORANGEFS_FS is not set # CONFIG_OSF_PARTITION is not set -# CONFIG_OSNOISE_TRACER is not set +CONFIG_OSNOISE_TRACER=y # CONFIG_OVERLAY_FS_INDEX is not set # CONFIG_OVERLAY_FS is not set # CONFIG_OVERLAY_FS_METACOPY is not set @@ -4203,7 +4203,7 @@ CONFIG_RANDOMIZE_BASE=y # CONFIG_RANDOMIZE_KSTACK_OFFSET_DEFAULT is not set CONFIG_RANDOMIZE_MEMORY=y # CONFIG_RANDOM_TRUST_BOOTLOADER is not set -# CONFIG_RANDOM_TRUST_CPU is not set +CONFIG_RANDOM_TRUST_CPU=y # CONFIG_RAPIDIO is not set # CONFIG_RAS_CEC is not set # CONFIG_RAS is not set @@ -5638,7 +5638,7 @@ CONFIG_THUNDERX2_PMU=m CONFIG_TIGON3_HWMON=y # CONFIG_TIGON3 is not set CONFIG_TIME_NS=y -# CONFIG_TIMERLAT_TRACER is not set +CONFIG_TIMERLAT_TRACER=y # CONFIG_TINYDRM_HX8357D is not set # CONFIG_TINYDRM_ILI9225 is not set # CONFIG_TINYDRM_ILI9341 is not set |