diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-06 18:18:56 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-06 18:18:56 +0200 |
| commit | a339309f875b7240e2006d47992e0b50b643d86c (patch) | |
| tree | 3b04252012d12cb3a35c29729ee609668fef1b70 /kernel-s390x-debug-fedora.config | |
| parent | 3d790d94ced7efa449659532cd178f7c37080e68 (diff) | |
| parent | 6694d05e5fc1a4a41107a172a53f7d9b6373cadf (diff) | |
| download | kernel-a339309f875b7240e2006d47992e0b50b643d86c.tar.gz kernel-a339309f875b7240e2006d47992e0b50b643d86c.tar.xz kernel-a339309f875b7240e2006d47992e0b50b643d86c.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc4.20211006git60a9483534ed.34.vanilla.1.fc36kernel-5.15.0-0.rc4.20211006git60a9483534ed.34.vanilla.1.fc35kernel-5.15.0-0.rc4.20211006git60a9483534ed.34.vanilla.1.fc34kernel-5.15.0-0.rc4.20211006git60a9483534ed.34.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-debug-fedora.config')
| -rw-r--r-- | kernel-s390x-debug-fedora.config | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 50830dac9..8d029f767 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1357,6 +1357,7 @@ CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_GM12U320=m CONFIG_DRM_GUD=m # CONFIG_DRM_HISI_HIBMC is not set +CONFIG_DRM_HYPERV=m # CONFIG_DRM_I2C_ADV7511 is not set CONFIG_DRM_I2C_ADV7533=y # CONFIG_DRM_I2C_CH7006 is not set @@ -1721,6 +1722,7 @@ CONFIG_FAULT_INJECTION=y # CONFIG_FB_CYBER2000 is not set CONFIG_FB_EFI=y # CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_HYPERV is not set # CONFIG_FB_I740 is not set # CONFIG_FB_IBM_GXT4500 is not set # CONFIG_FB_IMSTT is not set @@ -2029,6 +2031,7 @@ CONFIG_HID_GREENASIA=m CONFIG_HID_GT683R=m CONFIG_HID_GYRATION=m CONFIG_HID_HOLTEK=m +CONFIG_HID_HYPERV_MOUSE=m CONFIG_HID_ICADE=m # CONFIG_HID is not set CONFIG_HID_ITE=m @@ -2161,8 +2164,15 @@ CONFIG_HW_RANDOM_XIPHERA=m CONFIG_HW_RANDOM=y CONFIG_HWSPINLOCK=y # CONFIG_HX711 is not set -# CONFIG_HYPERV is not set +CONFIG_HYPERV_BALLOON=m +CONFIG_HYPERV_IOMMU=y +CONFIG_HYPERV_KEYBOARD=m +CONFIG_HYPERV=m +CONFIG_HYPERV_NET=m +CONFIG_HYPERV_STORAGE=m # CONFIG_HYPERV_TESTING is not set +CONFIG_HYPERV_UTILS=m +CONFIG_HYPERV_VSOCKETS=m CONFIG_HYSDN_CAPI=y CONFIG_HYSDN=m # CONFIG_HZ_1000 is not set @@ -4355,6 +4365,7 @@ CONFIG_PCIE_XILINX_CPM=y # CONFIG_PCI_GOOLPC is not set CONFIG_PCI_HERMES=m # CONFIG_PCI_HOST_GENERIC is not set +CONFIG_PCI_HYPERV=m CONFIG_PCI_IOV=y CONFIG_PCI_J721E_HOST=y # CONFIG_PCI_MESON is not set @@ -6448,7 +6459,6 @@ CONFIG_THERMAL_NETLINK=y # CONFIG_THERMAL_OF is not set CONFIG_THERMAL_STATISTICS=y # CONFIG_THERMAL_WRITABLE_TRIPS is not set -# CONFIG_THINKPAD_LMI is not set CONFIG_THRUSTMASTER_FF=y # CONFIG_TI_ADC081C is not set # CONFIG_TI_ADC0832 is not set |