diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-11 04:59:26 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-05-11 04:59:26 +0200 |
commit | 4175ff4c06a210cc0d4982fa271a45dc601c2a48 (patch) | |
tree | 19cce4d729e455ed8e89ff149b22ab73d1e61ccb /kernel-s390x-rhel.config | |
parent | edd23aa5290134f56d57c87a689e8002a8b23274 (diff) | |
parent | 1cac231319309a8322c7f29d89644752aba75a62 (diff) | |
download | kernel-4175ff4c06a210cc0d4982fa271a45dc601c2a48.tar.gz kernel-4175ff4c06a210cc0d4982fa271a45dc601c2a48.tar.xz kernel-4175ff4c06a210cc0d4982fa271a45dc601c2a48.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc1.13.vanilla.1.fc35kernel-5.13.0-0.rc1.13.vanilla.1.fc34kernel-5.13.0-0.rc1.13.vanilla.1.fc33kernel-5.13.0-0.rc1.13.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 377c939c3..cbaf0aeeb 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -11,7 +11,6 @@ CONFIG_8139TOO=m # CONFIG_8139TOO_PIO is not set # CONFIG_8139TOO_TUNE_TWISTER is not set # CONFIG_ABP060MG is not set -# CONFIG_ABX500_CORE is not set # CONFIG_ACCESSIBILITY is not set # CONFIG_ACER_WIRELESS is not set # CONFIG_ACORN_PARTITION is not set @@ -613,7 +612,7 @@ CONFIG_CGROUP_CPUACCT=y CONFIG_CGROUP_DEVICE=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_HUGETLB=y -# CONFIG_CGROUP_MISC is not set +CONFIG_CGROUP_MISC=y CONFIG_CGROUP_NET_CLASSID=y CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y @@ -695,6 +694,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set # CONFIG_CMA_DEBUG is not set +# CONFIG_CMA_SYSFS is not set CONFIG_CMA=y # CONFIG_CMDLINE_EXTEND is not set CONFIG_CMDLINE_FROM_BOOTLOADER=y @@ -938,7 +938,8 @@ CONFIG_CUSE=m # CONFIG_CXD2880_SPI_DRV is not set # CONFIG_CX_ECAT is not set CONFIG_CXL_BIMODAL=y -# CONFIG_CXL_BUS is not set +CONFIG_CXL_BUS=y +# CONFIG_CXL_MEM is not set # CONFIG_CYCLADES is not set # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set @@ -1585,7 +1586,7 @@ CONFIG_FUTEX=y CONFIG_FW_CFG_SYSFS=y CONFIG_FW_LOADER_COMPRESS=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set -CONFIG_FW_LOADER_USER_HELPER=y +# CONFIG_FW_LOADER_USER_HELPER is not set CONFIG_FW_LOADER=y CONFIG_FWTTY_MAX_CARD_PORTS=32 CONFIG_FWTTY_MAX_TOTAL_PORTS=64 @@ -2127,6 +2128,7 @@ CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # CONFIG_INPUT_IDEAPAD_SLIDEBAR is not set # CONFIG_INPUT_IMS_PCU is not set # CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set # CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_KEYBOARD is not set @@ -2162,6 +2164,7 @@ CONFIG_INTEGRITY=y # CONFIG_INTEL_ATOMISP2_PM is not set # CONFIG_INTEL_IDMA64 is not set CONFIG_INTEL_IDXD=m +# CONFIG_INTEL_IDXD_PERFMON is not set # CONFIG_INTEL_INT0002_VGPIO is not set # CONFIG_INTEL_IOMMU_DEBUGFS is not set # CONFIG_INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON is not set @@ -2186,6 +2189,7 @@ CONFIG_INTEL_RST=m # CONFIG_INTEL_SOC_PMIC_CHTWC is not set # CONFIG_INTEL_SOC_PMIC is not set # CONFIG_INTEL_STRATIX10_SERVICE is not set +# CONFIG_INTEL_TCC_COOLING is not set # CONFIG_INTEL_TH is not set CONFIG_INTEL_TURBO_MAX_3=y CONFIG_INTEL_UNCORE_FREQ_CONTROL=m @@ -3050,6 +3054,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMC_WBSD is not set # CONFIG_MMIOTRACE is not set CONFIG_MMU=y +CONFIG_MODPROBE_PATH="/usr/sbin/modprobe" # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_GZIP is not set # CONFIG_MODULE_COMPRESS is not set @@ -5098,7 +5103,6 @@ CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y # CONFIG_SND_SOC_MAX9759 is not set # CONFIG_SND_SOC_MAX98088 is not set CONFIG_SND_SOC_MAX98373=m -CONFIG_SND_SOC_MAX9839=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MAX9867 is not set @@ -5587,7 +5591,9 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_HIDEEP is not set +# CONFIG_TOUCHSCREEN_HYCON_HY46XX is not set # CONFIG_TOUCHSCREEN_ILI210X is not set +# CONFIG_TOUCHSCREEN_ILITEK is not set # CONFIG_TOUCHSCREEN_IMX6UL_TSC is not set # CONFIG_TOUCHSCREEN_INEXIO is not set # CONFIG_TOUCHSCREEN_IQS5XX is not set @@ -5596,6 +5602,7 @@ CONFIG_TORTURE_TEST=m # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set # CONFIG_TOUCHSCREEN_MK712 is not set # CONFIG_TOUCHSCREEN_MMS114 is not set +# CONFIG_TOUCHSCREEN_MSG2638 is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_PENMOUNT is not set # CONFIG_TOUCHSCREEN_PIXCIR is not set @@ -6021,7 +6028,6 @@ CONFIG_VDPA=m # CONFIG_VEML6030 is not set # CONFIG_VEML6070 is not set CONFIG_VETH=m -CONFIG_VEXPRESS_CONFIG=y CONFIG_VEXPRESS_SYSCFG=y CONFIG_VFAT_FS=m CONFIG_VFIO_AP=m @@ -6216,6 +6222,7 @@ CONFIG_VMCP=y CONFIG_VMLOGRDR=m CONFIG_VMWARE_PVSCSI=m # CONFIG_VMXNET3 is not set +# CONFIG_VP_VDPA is not set CONFIG_VSOCKETS_DIAG=m CONFIG_VSOCKETS_LOOPBACK=m CONFIG_VSOCKETS=m |