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-x86_64-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-x86_64-debug-fedora.config')
-rw-r--r-- | kernel-x86_64-debug-fedora.config | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 5116b0b09..c28695ac2 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -787,8 +787,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 @@ -1398,7 +1397,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 @@ -2726,7 +2725,7 @@ CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y CONFIG_INTEL_INT0002_VGPIO=m CONFIG_INTEL_IOATDMA=m -# CONFIG_INTEL_IOMMU_DEBUGFS is not set +CONFIG_INTEL_IOMMU_DEBUGFS=y # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set CONFIG_INTEL_IOMMU_FLOPPY_WA=y CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON=y @@ -3090,12 +3089,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 @@ -3410,6 +3405,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_DDR_PMU is not set @@ -7088,6 +7084,7 @@ CONFIG_TULIP=m CONFIG_TULIP_MMIO=y # CONFIG_TULIP_MWI is not set # CONFIG_TULIP_NAPI is not set +# CONFIG_TUNE_Z16 is not set CONFIG_TUN=m # CONFIG_TUN_VNET_CROSS_LE is not set # CONFIG_TWL4030_CORE is not set |