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-i686-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-i686-fedora.config')
| -rw-r--r-- | kernel-i686-fedora.config | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 425da76b3..21d87ce8e 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -3011,7 +3011,6 @@ CONFIG_KSM=y CONFIG_KSZ884X_PCI=m # CONFIG_KUNIT is not set CONFIG_KVM_AMD=m -CONFIG_KVM_ARM_PMU=y # CONFIG_KVM_DEBUG_FS is not set CONFIG_KVM_GUEST=y CONFIG_KVM_INTEL=m @@ -7228,7 +7227,6 @@ CONFIG_VMWARE_PVSCSI=m CONFIG_VMWARE_VMCI=m CONFIG_VMWARE_VMCI_VSOCKETS=m CONFIG_VMXNET3=m -# CONFIG_VOP_BUS is not set CONFIG_VORTEX=m CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m |