summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-11-05 18:10:45 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-11-05 18:10:45 +0100
commit11ffb8c51c4b99665e911493c2215c607da3cdb6 (patch)
tree588a064ce53d6c22a15de46d33dab77177d49d65 /configs
parent482a22dd83b9f6ae1c9a55b214ac9f270adf553c (diff)
parent06cc982c789d77b6932f45f8b75f0809743141c5 (diff)
downloadkernel-11ffb8c51c4b99665e911493c2215c607da3cdb6.tar.gz
kernel-11ffb8c51c4b99665e911493c2215c607da3cdb6.tar.xz
kernel-11ffb8c51c4b99665e911493c2215c607da3cdb6.zip
Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora
Diffstat (limited to 'configs')
-rw-r--r--configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND2
-rw-r--r--configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL2
-rw-r--r--configs/fedora/generic/powerpc/CONFIG_PPC_RTAS_FILTER1
3 files changed, 3 insertions, 2 deletions
diff --git a/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND b/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
index 2a186347d..39bec5884 100644
--- a/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
+++ b/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND
@@ -1 +1 @@
-CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
diff --git a/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL b/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL
index c08cd0d5d..97dc33b34 100644
--- a/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL
+++ b/configs/fedora/generic/CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL
@@ -1 +1 @@
-# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
diff --git a/configs/fedora/generic/powerpc/CONFIG_PPC_RTAS_FILTER b/configs/fedora/generic/powerpc/CONFIG_PPC_RTAS_FILTER
new file mode 100644
index 000000000..7470f4d4f
--- /dev/null
+++ b/configs/fedora/generic/powerpc/CONFIG_PPC_RTAS_FILTER
@@ -0,0 +1 @@
+CONFIG_PPC_RTAS_FILTER=y