On 6/1/20 11:38 PM, GitLab Bridge on behalf of jeremycline wrote:
From: "CKI@GitLab" <cki-project(a)redhat.com>
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
CONFIG_SENSORS_AMD_ENERGY:
If you say yes here you get support for core and package energy
sensors, based on RAPL MSR for AMD family 17h and above CPUs.
This driver can also be built as a module. If so, the module
will be called as amd_energy.
Symbol: SENSORS_AMD_ENERGY [=n]
Type : tristate
Defined at drivers/hwmon/Kconfig:327
Prompt: AMD RAPL MSR based Energy driver
Depends on: HWMON [=y] && X86 [=y]
Location:
-> Device Drivers
-> Hardware Monitoring support (HWMON [=y])
---
CONFIG_SENSORS_MAX16601:
If you say yes here you get hardware monitoring support for Maxim
MAX16601.
This driver can also be built as a module. If so, the module will
be called max16601.
Symbol: SENSORS_MAX16601 [=n]
Type : tristate
Defined at drivers/hwmon/pmbus/Kconfig:149
Prompt: Maxim MAX16601
Depends on: HWMON [=y] && PMBUS [=m]
Location:
-> Device Drivers
-> Hardware Monitoring support (HWMON [=y])
-> PMBus support (PMBUS [=m])
---
Cc: Dean Nelson <dnelson(a)redhat.com>
Signed-off-by: CKI@GitLab <cki-project(a)redhat.com>
---
.../common/generic/CONFIG_SENSORS_AMD_ENERGY | 1 +
.../common/generic/CONFIG_SENSORS_MAX16601 | 1 +
.../generic/CONFIG_SENSORS_AMD_ENERGY | 20 ------------------
.../generic/CONFIG_SENSORS_MAX16601 | 21 -------------------
4 files changed, 2 insertions(+), 41 deletions(-)
create mode 100644 redhat/configs/common/generic/CONFIG_SENSORS_AMD_ENERGY
create mode 100644 redhat/configs/common/generic/CONFIG_SENSORS_MAX16601
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_SENSORS_AMD_ENERGY
delete mode 100644 redhat/configs/pending-common/generic/CONFIG_SENSORS_MAX16601
diff --git a/redhat/configs/common/generic/CONFIG_SENSORS_AMD_ENERGY
b/redhat/configs/common/generic/CONFIG_SENSORS_AMD_ENERGY
new file mode 100644
index 000000000000..8a4fc5222e01
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_SENSORS_AMD_ENERGY
@@ -0,0 +1 @@
+# CONFIG_SENSORS_AMD_ENERGY is not set
diff --git a/redhat/configs/common/generic/CONFIG_SENSORS_MAX16601
b/redhat/configs/common/generic/CONFIG_SENSORS_MAX16601
new file mode 100644
index 000000000000..4fa6afb577fa
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_SENSORS_MAX16601
@@ -0,0 +1 @@
+# CONFIG_SENSORS_MAX16601 is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_SENSORS_AMD_ENERGY
b/redhat/configs/pending-common/generic/CONFIG_SENSORS_AMD_ENERGY
deleted file mode 100644
index 6dabcd827652..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_SENSORS_AMD_ENERGY
+++ /dev/null
@@ -1,20 +0,0 @@
-# CONFIG_SENSORS_AMD_ENERGY:
-#
-# If you say yes here you get support for core and package energy
-# sensors, based on RAPL MSR for AMD family 17h and above CPUs.
-#
-# This driver can also be built as a module. If so, the module
-# will be called as amd_energy.
-#
-# Symbol: SENSORS_AMD_ENERGY [=n]
-# Type : tristate
-# Defined at drivers/hwmon/Kconfig:327
-# Prompt: AMD RAPL MSR based Energy driver
-# Depends on: HWMON [=y] && X86 [=y]
-# Location:
-# -> Device Drivers
-# -> Hardware Monitoring support (HWMON [=y])
-#
-#
-#
-# CONFIG_SENSORS_AMD_ENERGY is not set
diff --git a/redhat/configs/pending-common/generic/CONFIG_SENSORS_MAX16601
b/redhat/configs/pending-common/generic/CONFIG_SENSORS_MAX16601
deleted file mode 100644
index 8ad67a216208..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_SENSORS_MAX16601
+++ /dev/null
@@ -1,21 +0,0 @@
-# CONFIG_SENSORS_MAX16601:
-#
-# If you say yes here you get hardware monitoring support for Maxim
-# MAX16601.
-#
-# This driver can also be built as a module. If so, the module will
-# be called max16601.
-#
-# Symbol: SENSORS_MAX16601 [=n]
-# Type : tristate
-# Defined at drivers/hwmon/pmbus/Kconfig:149
-# Prompt: Maxim MAX16601
-# Depends on: HWMON [=y] && PMBUS [=m]
-# Location:
-# -> Device Drivers
-# -> Hardware Monitoring support (HWMON [=y])
-# -> PMBus support (PMBUS [=m])
-#
-#
-#
-# CONFIG_SENSORS_MAX16601 is not set
Acked-by: Dean Nelson <dnelson(a)redhat.com>