From 98bf14a6aa39a24133d2087fda13ce5fb5615196 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 2 Oct 2020 12:57:41 -0500 Subject: kernel-5.9.0-0.rc7.20201002git60e720931556.23 * Fri Oct 02 2020 Fedora Kernel Team [5.9.0-0.rc7.20201002git60e720931556.23] - Merge ark-patches Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel-s390x-rhel.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'kernel-s390x-rhel.config') diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index a27af74b6..fdc704c64 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -1343,7 +1343,7 @@ CONFIG_ENABLE_MUST_CHECK=y # CONFIG_ENA_ETHERNET is not set CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCRYPTED_KEYS=m -# CONFIG_ENERGY_MODEL is not set +CONFIG_ENERGY_MODEL=y CONFIG_ENIC=m CONFIG_EPIC100=m CONFIG_EPOLL=y @@ -5256,7 +5256,7 @@ CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_HWMON=y # CONFIG_THERMAL is not set # CONFIG_THERMAL_MMIO is not set -# CONFIG_THERMAL_NETLINK is not set +CONFIG_THERMAL_NETLINK=y CONFIG_THERMAL_OF=y # CONFIG_THERMAL_STATISTICS is not set # CONFIG_THERMAL_WRITABLE_TRIPS is not set -- cgit