diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-05 05:55:42 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-02-05 05:55:42 +0100 |
commit | f2c5e070a9640031f07174d092721bcd5022eb9b (patch) | |
tree | 725ccb29403d80acfa32da2a1ae3e5bdb772c83b /kernel-x86_64-fedora.config | |
parent | f458f5b8a94e880216d8194ec2af8a99c9cdedab (diff) | |
parent | 6a28602fa738744deaf29ee931c02193843c43f8 (diff) | |
download | kernel-f2c5e070a9640031f07174d092721bcd5022eb9b.tar.gz kernel-f2c5e070a9640031f07174d092721bcd5022eb9b.tar.xz kernel-f2c5e070a9640031f07174d092721bcd5022eb9b.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc6.20210204git61556703b610.144.vanilla.1.fc34kernel-5.11.0-0.rc6.20210204git61556703b610.144.vanilla.1.fc33kernel-5.11.0-0.rc6.20210204git61556703b610.144.vanilla.1.fc32
Diffstat (limited to 'kernel-x86_64-fedora.config')
-rw-r--r-- | kernel-x86_64-fedora.config | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 1f2578e95..fe10dea18 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -2636,10 +2636,6 @@ CONFIG_INTEL_MEI_VIRTIO=m CONFIG_INTEL_MEI_WDT=m # CONFIG_INTEL_MENLOW is not set CONFIG_INTEL_MFLD_THERMAL=m -CONFIG_INTEL_MIC_BUS=m -CONFIG_INTEL_MIC_CARD=m -CONFIG_INTEL_MIC_HOST=m -CONFIG_INTEL_MIC_X100_DMA=m CONFIG_INTEL_MID_POWER_BUTTON=m CONFIG_INTEL_MRFLD_ADC=m CONFIG_INTEL_MRFLD_PWRBTN=m @@ -3065,7 +3061,6 @@ CONFIG_KSZ884X_PCI=m # CONFIG_KUNIT is not set CONFIG_KVM_AMD=m CONFIG_KVM_AMD_SEV=y -CONFIG_KVM_ARM_PMU=y # CONFIG_KVM_DEBUG_FS is not set CONFIG_KVM_GUEST=y CONFIG_KVM_INTEL=m @@ -3517,7 +3512,6 @@ CONFIG_MFD_WL1273_CORE=m CONFIG_MHI_BUS=m CONFIG_MHI_BUS_PCI_GENERIC=m CONFIG_MHI_NET=m -CONFIG_MIC_COSM=m # CONFIG_MICREL_KS8995MA is not set CONFIG_MICREL_PHY=m CONFIG_MICROCHIP_PHY=m @@ -5262,8 +5256,6 @@ CONFIG_SCHED_SMT=y CONFIG_SCHEDSTATS=y CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCHED_TRACER=y -CONFIG_SCIF_BUS=m -CONFIG_SCIF=m CONFIG_SC_LPASS_CORECC_7180=m # CONFIG_SCR24X is not set CONFIG_SCSI_3W_9XXX=m @@ -7286,8 +7278,6 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m -CONFIG_VOP_BUS=m -CONFIG_VOP=m CONFIG_VORTEX=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m |