diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-18 15:25:26 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-04-18 15:25:26 +0200 |
commit | 95325f68cbc232e30137829afdbe69770f410ec2 (patch) | |
tree | 151d96ebb7aae0973b1d1d3b6fc20690f63d2c6c /kernel-s390x-debug-rhel.config | |
parent | 042dd9d9f9254e80187215011fa4d37388e2b283 (diff) | |
parent | ca99a52fe681aef8cd9faf562832213410fb38ec (diff) | |
download | kernel-95325f68cbc232e30137829afdbe69770f410ec2.tar.gz kernel-95325f68cbc232e30137829afdbe69770f410ec2.tar.xz kernel-95325f68cbc232e30137829afdbe69770f410ec2.zip |
merge originkernel-5.18.0-0.rc3.27.vanilla.1.fc37kernel-5.18.0-0.rc3.27.vanilla.1.fc36kernel-5.18.0-0.rc3.27.vanilla.1.fc35kernel-5.18.0-0.rc3.27.vanilla.1.fc34
Diffstat (limited to 'kernel-s390x-debug-rhel.config')
-rw-r--r-- | kernel-s390x-debug-rhel.config | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index db9b3c50f..ec7516ab9 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -596,7 +596,7 @@ CONFIG_CAN_PEAK_USB=m CONFIG_CAN_RAW=m # CONFIG_CAN_SJA1000 is not set CONFIG_CAN_SLCAN=m -CONFIG_CAN_SOFTING=m +# CONFIG_CAN_SOFTING is not set # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m @@ -2476,11 +2476,13 @@ CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS_BASE_RELATIVE=y CONFIG_KALLSYMS=y # CONFIG_KARMA_PARTITION is not set -# CONFIG_KASAN is not set +CONFIG_KASAN_GENERIC=y +CONFIG_KASAN_INLINE=y CONFIG_KASAN_KUNIT_TEST=m # CONFIG_KASAN_MODULE_TEST is not set # CONFIG_KASAN_OUTLINE is not set CONFIG_KASAN_VMALLOC=y +CONFIG_KASAN=y # CONFIG_KCOV is not set # CONFIG_KCSAN is not set CONFIG_KDB_CONTINUE_CATASTROPHIC=0 @@ -2759,6 +2761,7 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z13 is not set CONFIG_MARCH_Z14=y # CONFIG_MARCH_Z15 is not set +# CONFIG_MARCH_Z16 is not set # CONFIG_MARCH_Z196 is not set # CONFIG_MARCH_Z900 is not set # CONFIG_MARCH_Z9_109 is not set @@ -5987,6 +5990,7 @@ CONFIG_TRUSTED_KEYS=y # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set CONFIG_TUNE_Z15=y +# CONFIG_TUNE_Z16 is not set # CONFIG_TUNE_Z196 is not set # CONFIG_TUNE_Z900 is not set # CONFIG_TUNE_Z9_109 is not set |