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-fedora.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-fedora.config')
| -rw-r--r-- | kernel-s390x-debug-fedora.config | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index a499e733b..8e92e7293 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -740,8 +740,7 @@ CONFIG_CAN_PEAK_USB=m CONFIG_CAN_RAW=m # CONFIG_CAN_SJA1000 is not set CONFIG_CAN_SLCAN=m -# CONFIG_CAN_SOFTING_CS is not set -CONFIG_CAN_SOFTING=m +# CONFIG_CAN_SOFTING is not set # CONFIG_CAN_UCAN is not set CONFIG_CAN_VCAN=m CONFIG_CAN_VXCAN=m @@ -1294,7 +1293,7 @@ CONFIG_DM_DEBUG=y CONFIG_DM_DELAY=m CONFIG_DM_DUST=m CONFIG_DM_EBS=m -# CONFIG_DM_ERA is not set +CONFIG_DM_ERA=m CONFIG_DM_FLAKEY=m CONFIG_DMIID=y CONFIG_DM_INIT=y @@ -2490,6 +2489,7 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_IDXD_COMPAT is not set CONFIG_INTEL_IDXD=m # CONFIG_INTEL_IDXD_PERFMON is not set +# CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set # CONFIG_INTEL_ISHTP_ECLITE is not set # CONFIG_INTEL_LDMA is not set @@ -2804,12 +2804,8 @@ CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y # CONFIG_KARMA_PARTITION is not set -# CONFIG_KASAN_GENERIC is not set -# CONFIG_KASAN_INLINE is not set # CONFIG_KASAN is not set -CONFIG_KASAN_KUNIT_TEST=m # CONFIG_KASAN_MODULE_TEST is not set -# CONFIG_KASAN_OUTLINE is not set # CONFIG_KASAN_VMALLOC is not set # CONFIG_KCOV is not set # CONFIG_KCSAN is not set @@ -3115,6 +3111,7 @@ CONFIG_MANTIS_CORE=m # CONFIG_MARCH_Z13 is not set # CONFIG_MARCH_Z14 is not set # 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 @@ -6656,6 +6653,7 @@ CONFIG_TUNE_DEFAULT=y # CONFIG_TUNE_Z13 is not set # CONFIG_TUNE_Z14 is not set # CONFIG_TUNE_Z15 is not set +# 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 |