diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-12 06:59:33 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-12 06:59:33 +0200 |
commit | 841be44a20bdadb864a4e03d88d074c2e04fb6dd (patch) | |
tree | 4924336652515764b9eb44aa23aa3fec83d54907 /kernel-x86_64-debug-rhel.config | |
parent | 4175ff4c06a210cc0d4982fa271a45dc601c2a48 (diff) | |
parent | 0de0c2db2c4af51d10f9f59bf9505366e88d4fcc (diff) | |
download | kernel-841be44a20bdadb864a4e03d88d074c2e04fb6dd.tar.gz kernel-841be44a20bdadb864a4e03d88d074c2e04fb6dd.tar.xz kernel-841be44a20bdadb864a4e03d88d074c2e04fb6dd.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc1.20210511git1140ab592e2e.14.vanilla.1.fc34
Diffstat (limited to 'kernel-x86_64-debug-rhel.config')
-rw-r--r-- | kernel-x86_64-debug-rhel.config | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 163cb6ff3..97c393b8d 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -197,7 +197,6 @@ CONFIG_ANON_INODES=y # CONFIG_APDS9300 is not set CONFIG_APDS9802ALS=m # CONFIG_APDS9960 is not set -# CONFIG_APPLE_AIC is not set CONFIG_APPLE_GMUX=m # CONFIG_APPLE_MFI_FASTCHARGE is not set CONFIG_APPLE_PROPERTIES=y @@ -206,14 +205,12 @@ CONFIG_AQTION=m CONFIG_AQUANTIA_PHY=m # CONFIG_AR5523 is not set # CONFIG_ARCH_ACTIONS is not set -# CONFIG_ARCH_AGILEX is not set # CONFIG_ARCH_ALPINE is not set # CONFIG_ARCH_APPLE is not set # CONFIG_ARCH_BCM2835 is not set # CONFIG_ARCH_BCM4908 is not set # CONFIG_ARCH_BITMAIN is not set # CONFIG_ARCH_BRCMSTB is not set -# CONFIG_ARCH_INTEL_SOCFPGA is not set # CONFIG_ARCH_KEEMBAY is not set # CONFIG_ARCH_LG1K is not set # CONFIG_ARCH_MEMORY_PROBE is not set @@ -2162,7 +2159,7 @@ CONFIG_IEEE802154=m # CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set CONFIG_IEEE802154_SOCKET=m CONFIG_IFB=m -# CONFIG_IFCVF is not set +CONFIG_IFCVF=m CONFIG_IGB_DCA=y CONFIG_IGB_HWMON=y CONFIG_IGB=m @@ -2344,7 +2341,7 @@ CONFIG_INTEL_HID_EVENT=m CONFIG_INTEL_IDLE=y CONFIG_INTEL_IDMA64=m CONFIG_INTEL_IDXD=m -# CONFIG_INTEL_IDXD_PERFMON is not set +CONFIG_INTEL_IDXD_PERFMON=y CONFIG_INTEL_IDXD_SVM=y # CONFIG_INTEL_INT0002_VGPIO is not set CONFIG_INTEL_IOATDMA=m @@ -3201,7 +3198,7 @@ CONFIG_MLX5_SF=y CONFIG_MLX5_SW_STEERING=y CONFIG_MLX5_TC_SAMPLE=y # CONFIG_MLX5_TLS is not set -# CONFIG_MLX5_VDPA_NET is not set +CONFIG_MLX5_VDPA_NET=m # CONFIG_MLX90614 is not set # CONFIG_MLX90632 is not set # CONFIG_MLXBF_BOOTCTL is not set @@ -6327,7 +6324,9 @@ CONFIG_UWB_WHCI=m # CONFIG_VCNL4035 is not set CONFIG_VDPA=m # CONFIG_VDPA_MENU is not set -# CONFIG_VDPA_SIM is not set +# CONFIG_VDPA_SIM_BLOCK is not set +CONFIG_VDPA_SIM=m +# CONFIG_VDPA_SIM_NET is not set # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m |