[OS-BUILD PATCH 0/14] 5.11 acpi cleanup

[GitLab Bridge on behalf of pbrobinson]

From: pbrobinson on gitlab.com

Clean up the duplicated ACPI options across Fedora and ARK kernels. The
two architectures supported are aarc64/x86. Putting these options in
common/generic and common/debug doesn't affect non ACPI architectures
due to CONFIG_ACPI and associated Kconfig deps. The first big commit
doesn't change anything just moves the duplicated options to common/ and
removes the dupes.

From there each of the patches are documented, some remove dead options,
some adjust things like ACPI_EC_DEBUGFS that make sense for security and
so platforms aren't accidentally bricked. There's a couple that change
ark/aarch64 with appropriate maintainers cc:ed and really just bring it
inline with other arches, and finally there's a few minor Fedora tweaks
with Justin cc:ed in.

[OS-BUILD PATCH 1/14] All: ACPI: De-dupe the ACPI options that are the same across ark/fedora on x86/arm

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

There's a mass duplications of ACPI options across aarch64/x86 on both Fedora
and ARK kernels. Moving them into common doesn't affect non ACPI arches as
all the options are under the ACPI menu which only gets selected if the arch
presents ARCH_SUPPORTS_ACPI and some options were already in common/geneic.

There's no functional change here, this is purely de-dupe.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 .../debug/CONFIG_ACPI_APEI_ERST_DEBUG         |  0
 .../debug/CONFIG_ACPI_DEBUGGER                |  0
 .../debug/CONFIG_ACPI_DEBUGGER_USER           |  0
 .../{ark => common}/generic/CONFIG_ACPI_AC    |  0
 .../{ark => common}/generic/CONFIG_ACPI_APEI  |  0
 .../generic/CONFIG_ACPI_APEI_EINJ             |  0
 .../generic/CONFIG_ACPI_APEI_ERST_DEBUG       |  0
 .../generic/CONFIG_ACPI_APEI_GHES             |  0
 .../generic}/CONFIG_ACPI_APEI_MEMORY_FAILURE  |  0
 .../generic/CONFIG_ACPI_APEI_PCIEAER          |  0
 .../generic/CONFIG_ACPI_BATTERY               |  0
 .../generic}/CONFIG_ACPI_BUTTON               |  0
 .../generic}/CONFIG_ACPI_CONTAINER            |  0
 .../generic/CONFIG_ACPI_DEBUGGER_USER         |  0
 .../x86_64 => common/generic}/CONFIG_ACPI_FAN |  0
 .../{ark => common}/generic/CONFIG_ACPI_HED   |  0
 .../generic/CONFIG_ACPI_I2C_OPREGION          |  0
 .../{ark => common}/generic/CONFIG_ACPI_IPMI  |  0
 .../{ark => common}/generic/CONFIG_ACPI_NFIT  |  0
 .../{arm/aarch64 => }/CONFIG_ACPI_NUMA        |  0
 .../generic/CONFIG_ACPI_PROCESSOR             |  0
 .../generic}/CONFIG_ACPI_SPCR_TABLE           |  0
 .../generic/CONFIG_ACPI_TABLE_UPGRADE         |  0
 .../generic}/CONFIG_ACPI_THERMAL              |  0
 .../aarch64/CONFIG_ACPI_APEI_MEMORY_FAILURE   |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_BUTTON    |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_CONTAINER |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_FAN       |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_THERMAL   |  1 -
 .../x86}/CONFIG_ACPI_PROCESSOR_AGGREGATOR     |  0
 .../x86}/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE    |  0
 .../generic/x86}/CONFIG_ACPI_SBS              |  0
 .../generic/x86}/CONFIG_ACPI_SLEEP            |  0
 .../generic/x86}/CONFIG_ACPI_WMI              |  0
 .../generic/x86/x86_64/CONFIG_ACPI_NUMA       |  1 -
 .../configs/fedora/generic/CONFIG_ACPI_NFIT   |  1 -
 .../fedora/generic/CONFIG_ACPI_SPCR_TABLE     |  1 -
 .../fedora/generic/CONFIG_ACPI_TABLE_UPGRADE  | 19 -------------------
 .../fedora/generic/arm/aarch64/CONFIG_ACPI_AC |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_APEI      |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_APEI_EINJ |  1 -
 .../arm/aarch64/CONFIG_ACPI_APEI_ERST_DEBUG   |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_APEI_GHES |  1 -
 .../arm/aarch64/CONFIG_ACPI_APEI_PCIEAER      |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_BATTERY   |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_HED       |  1 -
 .../arm/aarch64/CONFIG_ACPI_I2C_OPREGION      |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_IPMI      |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_NFIT      |  1 -
 .../generic/arm/aarch64/CONFIG_ACPI_PROCESSOR |  1 -
 .../configs/fedora/generic/x86/CONFIG_ACPI_AC |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_APEI       |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_APEI_EINJ  |  1 -
 .../generic/x86/CONFIG_ACPI_APEI_ERST_DEBUG   |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_APEI_GHES  |  1 -
 .../x86/CONFIG_ACPI_APEI_MEMORY_FAILURE       |  1 -
 .../generic/x86/CONFIG_ACPI_APEI_PCIEAER      |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_BATTERY    |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_BUTTON     |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_CONTAINER  |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_FAN        |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_HED        |  1 -
 .../generic/x86/CONFIG_ACPI_I2C_OPREGION      |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_IPMI       |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_PROCESSOR  |  1 -
 .../x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE     |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_SBS        |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_THERMAL    |  1 -
 .../fedora/generic/x86/CONFIG_ACPI_WMI        |  1 -
 .../generic/x86/x86_64/CONFIG_ACPI_NFIT       |  1 -
 70 files changed, 59 deletions(-)
 rename redhat/configs/{ark => common}/debug/CONFIG_ACPI_APEI_ERST_DEBUG (100%)
 rename redhat/configs/{ark => common}/debug/CONFIG_ACPI_DEBUGGER (100%)
 rename redhat/configs/{ark => common}/debug/CONFIG_ACPI_DEBUGGER_USER (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_AC (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_APEI (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_APEI_EINJ (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_APEI_ERST_DEBUG (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_APEI_GHES (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic}/CONFIG_ACPI_APEI_MEMORY_FAILURE (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_APEI_PCIEAER (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_BATTERY (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic}/CONFIG_ACPI_BUTTON
(100%)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic}/CONFIG_ACPI_CONTAINER
(100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_DEBUGGER_USER (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic}/CONFIG_ACPI_FAN
(100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_HED (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_I2C_OPREGION (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_IPMI (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_NFIT (100%)
 rename redhat/configs/common/generic/{arm/aarch64 => }/CONFIG_ACPI_NUMA (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_PROCESSOR (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic}/CONFIG_ACPI_SPCR_TABLE (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_TABLE_UPGRADE (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic}/CONFIG_ACPI_THERMAL
(100%)
 delete mode 100644
redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_APEI_MEMORY_FAILURE
 delete mode 100644 redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_BUTTON
 delete mode 100644 redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_CONTAINER
 delete mode 100644 redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_FAN
 delete mode 100644 redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_THERMAL
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_ACPI_PROCESSOR_AGGREGATOR (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic/x86}/CONFIG_ACPI_SBS
(100%)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic/x86}/CONFIG_ACPI_SLEEP
(100%)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic/x86}/CONFIG_ACPI_WMI
(100%)
 delete mode 100644 redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_NUMA
 delete mode 100644 redhat/configs/fedora/generic/CONFIG_ACPI_NFIT
 delete mode 100644 redhat/configs/fedora/generic/CONFIG_ACPI_SPCR_TABLE
 delete mode 100644 redhat/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_AC
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_EINJ
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_ERST_DEBUG
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_GHES
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_PCIEAER
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BATTERY
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_HED
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_I2C_OPREGION
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_IPMI
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_NFIT
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_PROCESSOR
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_AC
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_EINJ
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_ERST_DEBUG
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_GHES
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_PCIEAER
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_BATTERY
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_BUTTON
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_CONTAINER
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_FAN
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_HED
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_I2C_OPREGION
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_IPMI
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_PROCESSOR
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_SBS
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_THERMAL
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_WMI
 delete mode 100644 redhat/configs/fedora/generic/x86/x86_64/CONFIG_ACPI_NFIT

diff --git a/redhat/configs/ark/debug/CONFIG_ACPI_APEI_ERST_DEBUG
b/redhat/configs/common/debug/CONFIG_ACPI_APEI_ERST_DEBUG
similarity index 100%
rename from redhat/configs/ark/debug/CONFIG_ACPI_APEI_ERST_DEBUG
rename to redhat/configs/common/debug/CONFIG_ACPI_APEI_ERST_DEBUG
diff --git a/redhat/configs/ark/debug/CONFIG_ACPI_DEBUGGER
b/redhat/configs/common/debug/CONFIG_ACPI_DEBUGGER
similarity index 100%
rename from redhat/configs/ark/debug/CONFIG_ACPI_DEBUGGER
rename to redhat/configs/common/debug/CONFIG_ACPI_DEBUGGER
diff --git a/redhat/configs/ark/debug/CONFIG_ACPI_DEBUGGER_USER
b/redhat/configs/common/debug/CONFIG_ACPI_DEBUGGER_USER
similarity index 100%
rename from redhat/configs/ark/debug/CONFIG_ACPI_DEBUGGER_USER
rename to redhat/configs/common/debug/CONFIG_ACPI_DEBUGGER_USER
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_AC
b/redhat/configs/common/generic/CONFIG_ACPI_AC
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_AC
rename to redhat/configs/common/generic/CONFIG_ACPI_AC
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_APEI
b/redhat/configs/common/generic/CONFIG_ACPI_APEI
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_APEI
rename to redhat/configs/common/generic/CONFIG_ACPI_APEI
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_APEI_EINJ
b/redhat/configs/common/generic/CONFIG_ACPI_APEI_EINJ
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_APEI_EINJ
rename to redhat/configs/common/generic/CONFIG_ACPI_APEI_EINJ
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_APEI_ERST_DEBUG
b/redhat/configs/common/generic/CONFIG_ACPI_APEI_ERST_DEBUG
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_APEI_ERST_DEBUG
rename to redhat/configs/common/generic/CONFIG_ACPI_APEI_ERST_DEBUG
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_APEI_GHES
b/redhat/configs/common/generic/CONFIG_ACPI_APEI_GHES
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_APEI_GHES
rename to redhat/configs/common/generic/CONFIG_ACPI_APEI_GHES
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_APEI_MEMORY_FAILURE
b/redhat/configs/common/generic/CONFIG_ACPI_APEI_MEMORY_FAILURE
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_APEI_MEMORY_FAILURE
rename to redhat/configs/common/generic/CONFIG_ACPI_APEI_MEMORY_FAILURE
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_APEI_PCIEAER
b/redhat/configs/common/generic/CONFIG_ACPI_APEI_PCIEAER
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_APEI_PCIEAER
rename to redhat/configs/common/generic/CONFIG_ACPI_APEI_PCIEAER
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_BATTERY
b/redhat/configs/common/generic/CONFIG_ACPI_BATTERY
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_BATTERY
rename to redhat/configs/common/generic/CONFIG_ACPI_BATTERY
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_BUTTON
b/redhat/configs/common/generic/CONFIG_ACPI_BUTTON
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_BUTTON
rename to redhat/configs/common/generic/CONFIG_ACPI_BUTTON
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_CONTAINER
b/redhat/configs/common/generic/CONFIG_ACPI_CONTAINER
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_CONTAINER
rename to redhat/configs/common/generic/CONFIG_ACPI_CONTAINER
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_DEBUGGER_USER
b/redhat/configs/common/generic/CONFIG_ACPI_DEBUGGER_USER
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_DEBUGGER_USER
rename to redhat/configs/common/generic/CONFIG_ACPI_DEBUGGER_USER
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_FAN
b/redhat/configs/common/generic/CONFIG_ACPI_FAN
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_FAN
rename to redhat/configs/common/generic/CONFIG_ACPI_FAN
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_HED
b/redhat/configs/common/generic/CONFIG_ACPI_HED
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_HED
rename to redhat/configs/common/generic/CONFIG_ACPI_HED
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_I2C_OPREGION
b/redhat/configs/common/generic/CONFIG_ACPI_I2C_OPREGION
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_I2C_OPREGION
rename to redhat/configs/common/generic/CONFIG_ACPI_I2C_OPREGION
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_IPMI
b/redhat/configs/common/generic/CONFIG_ACPI_IPMI
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_IPMI
rename to redhat/configs/common/generic/CONFIG_ACPI_IPMI
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_NFIT
b/redhat/configs/common/generic/CONFIG_ACPI_NFIT
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_NFIT
rename to redhat/configs/common/generic/CONFIG_ACPI_NFIT
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_NUMA
b/redhat/configs/common/generic/CONFIG_ACPI_NUMA
similarity index 100%
rename from redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_NUMA
rename to redhat/configs/common/generic/CONFIG_ACPI_NUMA
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_PROCESSOR
b/redhat/configs/common/generic/CONFIG_ACPI_PROCESSOR
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_PROCESSOR
rename to redhat/configs/common/generic/CONFIG_ACPI_PROCESSOR
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_SPCR_TABLE
b/redhat/configs/common/generic/CONFIG_ACPI_SPCR_TABLE
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_SPCR_TABLE
rename to redhat/configs/common/generic/CONFIG_ACPI_SPCR_TABLE
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_TABLE_UPGRADE
b/redhat/configs/common/generic/CONFIG_ACPI_TABLE_UPGRADE
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_TABLE_UPGRADE
rename to redhat/configs/common/generic/CONFIG_ACPI_TABLE_UPGRADE
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_THERMAL
b/redhat/configs/common/generic/CONFIG_ACPI_THERMAL
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_THERMAL
rename to redhat/configs/common/generic/CONFIG_ACPI_THERMAL
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_APEI_MEMORY_FAILURE
b/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_APEI_MEMORY_FAILURE
deleted file mode 100644
index 46aa1579fd2a..000000000000
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_APEI_MEMORY_FAILURE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_BUTTON
b/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_BUTTON
deleted file mode 100644
index 1f552016b1da..000000000000
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_BUTTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_BUTTON=y
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_CONTAINER
b/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_CONTAINER
deleted file mode 100644
index 24287daf8421..000000000000
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_CONTAINER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CONTAINER=y
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_FAN
b/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_FAN
deleted file mode 100644
index 0feefba7b3f0..000000000000
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_FAN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_FAN=y
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_THERMAL
b/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_THERMAL
deleted file mode 100644
index 1bd7964b474e..000000000000
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_ACPI_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_THERMAL=y
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_PROCESSOR_AGGREGATOR
b/redhat/configs/common/generic/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_PROCESSOR_AGGREGATOR
rename to redhat/configs/common/generic/x86/CONFIG_ACPI_PROCESSOR_AGGREGATOR
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
b/redhat/configs/common/generic/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
rename to redhat/configs/common/generic/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_SBS
b/redhat/configs/common/generic/x86/CONFIG_ACPI_SBS
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_SBS
rename to redhat/configs/common/generic/x86/CONFIG_ACPI_SBS
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_SLEEP
b/redhat/configs/common/generic/x86/CONFIG_ACPI_SLEEP
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_SLEEP
rename to redhat/configs/common/generic/x86/CONFIG_ACPI_SLEEP
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_WMI
b/redhat/configs/common/generic/x86/CONFIG_ACPI_WMI
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_WMI
rename to redhat/configs/common/generic/x86/CONFIG_ACPI_WMI
diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_NUMA
b/redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_NUMA
deleted file mode 100644
index 19881f440202..000000000000
--- a/redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_NUMA
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_NUMA=y
diff --git a/redhat/configs/fedora/generic/CONFIG_ACPI_NFIT
b/redhat/configs/fedora/generic/CONFIG_ACPI_NFIT
deleted file mode 100644
index ded79a03275f..000000000000
--- a/redhat/configs/fedora/generic/CONFIG_ACPI_NFIT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_NFIT is not set
diff --git a/redhat/configs/fedora/generic/CONFIG_ACPI_SPCR_TABLE
b/redhat/configs/fedora/generic/CONFIG_ACPI_SPCR_TABLE
deleted file mode 100644
index f8a19253c3b0..000000000000
--- a/redhat/configs/fedora/generic/CONFIG_ACPI_SPCR_TABLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_SPCR_TABLE=y
diff --git a/redhat/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
b/redhat/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
deleted file mode 100644
index 627d89b8c4a2..000000000000
--- a/redhat/configs/fedora/generic/CONFIG_ACPI_TABLE_UPGRADE
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_ACPI_TABLE_UPGRADE:
-# 
-# This option provides functionality to upgrade arbitrary ACPI tables
-# via initrd. No functional change if no ACPI tables are passed via
-# initrd, therefore it's safe to say Y.
-# See Documentation/admin-guide/acpi/initrd_table_override.rst for details
-# 
-# Symbol: ACPI_TABLE_UPGRADE [=y]
-# Type  : bool
-# Defined at drivers/acpi/Kconfig:349
-#   Prompt: Allow upgrading ACPI tables via initrd
-#   Depends on: ACPI [=y] && BLK_DEV_INITRD [=y] &&
ARCH_HAS_ACPI_TABLE_UPGRADE [=y]
-#   Location:
-#     -> Power management and ACPI options
-#       -> ACPI (Advanced Configuration and Power Interface) Support (ACPI [=y])
-# 
-# 
-# 
-CONFIG_ACPI_TABLE_UPGRADE=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_AC
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_AC
deleted file mode 100644
index 5dbaee1a85df..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_AC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_AC=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI
deleted file mode 100644
index 9ab33facf55a..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_EINJ
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_EINJ
deleted file mode 100644
index 2d03b69a1358..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_EINJ
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_APEI_EINJ is not set
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_ERST_DEBUG
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_ERST_DEBUG
deleted file mode 100644
index 235760d408f4..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_ERST_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_APEI_ERST_DEBUG is not set
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_GHES
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_GHES
deleted file mode 100644
index 8fd037d8f12b..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_GHES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_GHES=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_PCIEAER
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_PCIEAER
deleted file mode 100644
index 26f3e912912f..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_APEI_PCIEAER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BATTERY
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BATTERY
deleted file mode 100644
index eb3286698d34..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BATTERY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_BATTERY=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_HED
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_HED
deleted file mode 100644
index 06042df5ab2e..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_HED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_HED=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_I2C_OPREGION
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_I2C_OPREGION
deleted file mode 100644
index 92036b9757c8..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_I2C_OPREGION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_I2C_OPREGION=y
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_IPMI
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_IPMI
deleted file mode 100644
index e40fb9aeac03..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_IPMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_IPMI=m
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_NFIT
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_NFIT
deleted file mode 100644
index 922b719bf78b..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_NFIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_NFIT=m
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_PROCESSOR
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_PROCESSOR
deleted file mode 100644
index a24416dcfc82..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_PROCESSOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_PROCESSOR=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_AC
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_AC
deleted file mode 100644
index 5dbaee1a85df..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_AC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_AC=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI
deleted file mode 100644
index 9ab33facf55a..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_EINJ
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_EINJ
deleted file mode 100644
index 66e425d5b770..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_EINJ
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_EINJ=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_ERST_DEBUG
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_ERST_DEBUG
deleted file mode 100644
index 235760d408f4..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_ERST_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_APEI_ERST_DEBUG is not set
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_GHES
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_GHES
deleted file mode 100644
index 8fd037d8f12b..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_GHES
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_GHES=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE
deleted file mode 100644
index 46aa1579fd2a..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_MEMORY_FAILURE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_MEMORY_FAILURE=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_PCIEAER
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_PCIEAER
deleted file mode 100644
index 26f3e912912f..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_APEI_PCIEAER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_APEI_PCIEAER=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_BATTERY
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_BATTERY
deleted file mode 100644
index eb3286698d34..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_BATTERY
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_BATTERY=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_BUTTON
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_BUTTON
deleted file mode 100644
index 1f552016b1da..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_BUTTON
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_BUTTON=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CONTAINER
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CONTAINER
deleted file mode 100644
index 24287daf8421..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CONTAINER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CONTAINER=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_FAN
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_FAN
deleted file mode 100644
index 0feefba7b3f0..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_FAN
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_FAN=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_HED
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_HED
deleted file mode 100644
index 06042df5ab2e..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_HED
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_HED=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_I2C_OPREGION
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_I2C_OPREGION
deleted file mode 100644
index 92036b9757c8..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_I2C_OPREGION
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_I2C_OPREGION=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_IPMI
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_IPMI
deleted file mode 100644
index e40fb9aeac03..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_IPMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_IPMI=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_PROCESSOR
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_PROCESSOR
deleted file mode 100644
index a24416dcfc82..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_PROCESSOR
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_PROCESSOR=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
deleted file mode 100644
index 021ea2f25134..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_REV_OVERRIDE_POSSIBLE
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_SBS
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_SBS
deleted file mode 100644
index 82848bd17fc2..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_SBS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_SBS=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_THERMAL
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_THERMAL
deleted file mode 100644
index 1bd7964b474e..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_THERMAL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_THERMAL=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_WMI
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_WMI
deleted file mode 100644
index 9cef4743c8cc..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_WMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_WMI=m
diff --git a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_ACPI_NFIT
b/redhat/configs/fedora/generic/x86/x86_64/CONFIG_ACPI_NFIT
deleted file mode 100644
index 922b719bf78b..000000000000
--- a/redhat/configs/fedora/generic/x86/x86_64/CONFIG_ACPI_NFIT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_NFIT=m
-- 
GitLab

[OS-BUILD PATCH 2/14] cleanup: ACPI_PROCFS_POWER was removed upstream

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

No change as ACPI_PROCFS_POWER was removed in upstream
commit 8830280 in May 2020

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_PROCFS_POWER   | 1 -
 .../configs/fedora/generic/arm/aarch64/CONFIG_ACPI_PROCFS_POWER  | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_ACPI_PROCFS_POWER       | 1 -
 3 files changed, 3 deletions(-)
 delete mode 100644 redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_PROCFS_POWER
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_PROCFS_POWER
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_PROCFS_POWER

diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_PROCFS_POWER
b/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_PROCFS_POWER
deleted file mode 100644
index 4476fecda44c..000000000000
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_PROCFS_POWER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_PROCFS_POWER is not set
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_PROCFS_POWER
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_PROCFS_POWER
deleted file mode 100644
index 26cea31798a8..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_PROCFS_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_PROCFS_POWER=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_PROCFS_POWER
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_PROCFS_POWER
deleted file mode 100644
index 4476fecda44c..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_PROCFS_POWER
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_PROCFS_POWER is not set
-- 
GitLab

[OS-BUILD PATCH 3/14] All: Disable Intel Classmate PC ACPI_CMPC option

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

The Intel Classmate PC's were x86-32 only with the last generation
being a first gen Atom. This option is hence unused across all
kernels.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_CMPC | 1 -
 redhat/configs/common/generic/CONFIG_ACPI_CMPC         | 1 +
 redhat/configs/fedora/generic/x86/CONFIG_ACPI_CMPC     | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_CMPC
 create mode 100644 redhat/configs/common/generic/CONFIG_ACPI_CMPC
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_CMPC

diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_CMPC
b/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_CMPC
deleted file mode 100644
index 72ad5cede8ea..000000000000
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_CMPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CMPC=m
diff --git a/redhat/configs/common/generic/CONFIG_ACPI_CMPC
b/redhat/configs/common/generic/CONFIG_ACPI_CMPC
new file mode 100644
index 000000000000..c84d9fccf85c
--- /dev/null
+++ b/redhat/configs/common/generic/CONFIG_ACPI_CMPC
@@ -0,0 +1 @@
+# CONFIG_ACPI_CMPC is not set
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CMPC
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CMPC
deleted file mode 100644
index 72ad5cede8ea..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CMPC
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CMPC=m
-- 
GitLab

[OS-BUILD PATCH 7/14] All: x86: Move ACPI_VIDEO to common/x86

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

No chnage, just de-dupes the Fedora/ARK options

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 .../generic/x86/x86_64 => common/generic/x86}/CONFIG_ACPI_VIDEO  | 0
 redhat/configs/fedora/generic/x86/CONFIG_ACPI_VIDEO              | 1 -
 2 files changed, 1 deletion(-)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic/x86}/CONFIG_ACPI_VIDEO
(100%)
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_VIDEO

diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_VIDEO
b/redhat/configs/common/generic/x86/CONFIG_ACPI_VIDEO
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_VIDEO
rename to redhat/configs/common/generic/x86/CONFIG_ACPI_VIDEO
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_VIDEO
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_VIDEO
deleted file mode 100644
index b642d06e3ad4..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_VIDEO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_VIDEO=m
-- 
GitLab

[OS-BUILD PATCH 4/14] All: Only build ACPI_EC_DEBUGFS for debug kernels

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

As per the Kconfig help ACPI_EC_DEBUGFS is for poking at the
system's Embedded Controller via a /sys/kernel/debug interface
and we really shouldn't encourage this for standard use as it's
explicitly designed for debugging drivers/hardware.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 .../generic/x86/x86_64 => common/debug}/CONFIG_ACPI_EC_DEBUGFS   | 0
 .../arm/aarch64 => common/generic}/CONFIG_ACPI_EC_DEBUGFS        | 0
 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_ACPI_EC_DEBUGFS         | 1 -
 4 files changed, 2 deletions(-)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/debug}/CONFIG_ACPI_EC_DEBUGFS
(100%)
 rename redhat/configs/{ark/generic/arm/aarch64 =>
common/generic}/CONFIG_ACPI_EC_DEBUGFS (100%)
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_EC_DEBUGFS

diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_EC_DEBUGFS
b/redhat/configs/common/debug/CONFIG_ACPI_EC_DEBUGFS
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_EC_DEBUGFS
rename to redhat/configs/common/debug/CONFIG_ACPI_EC_DEBUGFS
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
b/redhat/configs/common/generic/CONFIG_ACPI_EC_DEBUGFS
similarity index 100%
rename from redhat/configs/ark/generic/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
rename to redhat/configs/common/generic/CONFIG_ACPI_EC_DEBUGFS
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
deleted file mode 100644
index df1424ceeea6..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_EC_DEBUGFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_EC_DEBUGFS=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_EC_DEBUGFS
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_EC_DEBUGFS
deleted file mode 100644
index dfc6b278f421..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_EC_DEBUGFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_EC_DEBUGFS=m
-- 
GitLab

[OS-BUILD PATCH 6/14] All: x86: Enable ACPI_DPTF (Intel DPTF)

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

Enable the Intel Dynamic Platform and Thermal Framework on all
x86 kernels, and sync the sub components in common/generic/x86.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 .../common/generic/CONFIG_DPTF_PCH_FIVR       |  1 -
 .../common/generic/x86/CONFIG_ACPI_DPTF       |  1 +
 .../common/generic/x86/CONFIG_DPTF_PCH_FIVR   |  1 +
 .../generic/x86}/CONFIG_DPTF_POWER            |  0
 .../fedora/generic/x86/CONFIG_ACPI_DPTF       | 24 -------------------
 .../fedora/generic/x86/CONFIG_DPTF_PCH_FIVR   | 24 -------------------
 .../fedora/generic/x86/CONFIG_DPTF_POWER      |  1 -
 .../pending-common/generic/CONFIG_ACPI_DPTF   | 24 -------------------
 8 files changed, 2 insertions(+), 74 deletions(-)
 delete mode 100644 redhat/configs/common/generic/CONFIG_DPTF_PCH_FIVR
 create mode 100644 redhat/configs/common/generic/x86/CONFIG_ACPI_DPTF
 create mode 100644 redhat/configs/common/generic/x86/CONFIG_DPTF_PCH_FIVR
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic/x86}/CONFIG_DPTF_POWER
(100%)
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_DPTF
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_DPTF_PCH_FIVR
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_DPTF_POWER
 delete mode 100644 redhat/configs/pending-common/generic/CONFIG_ACPI_DPTF

diff --git a/redhat/configs/common/generic/CONFIG_DPTF_PCH_FIVR
b/redhat/configs/common/generic/CONFIG_DPTF_PCH_FIVR
deleted file mode 100644
index e201b9b14135..000000000000
--- a/redhat/configs/common/generic/CONFIG_DPTF_PCH_FIVR
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_DPTF_PCH_FIVR is not set
diff --git a/redhat/configs/common/generic/x86/CONFIG_ACPI_DPTF
b/redhat/configs/common/generic/x86/CONFIG_ACPI_DPTF
new file mode 100644
index 000000000000..22e8cec522d0
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_ACPI_DPTF
@@ -0,0 +1 @@
+CONFIG_ACPI_DPTF=y
diff --git a/redhat/configs/common/generic/x86/CONFIG_DPTF_PCH_FIVR
b/redhat/configs/common/generic/x86/CONFIG_DPTF_PCH_FIVR
new file mode 100644
index 000000000000..84a2775c19e5
--- /dev/null
+++ b/redhat/configs/common/generic/x86/CONFIG_DPTF_PCH_FIVR
@@ -0,0 +1 @@
+CONFIG_DPTF_PCH_FIVR=m
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_DPTF_POWER
b/redhat/configs/common/generic/x86/CONFIG_DPTF_POWER
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_DPTF_POWER
rename to redhat/configs/common/generic/x86/CONFIG_DPTF_POWER
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_DPTF
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_DPTF
deleted file mode 100644
index 0ab607006652..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_DPTF
+++ /dev/null
@@ -1,24 +0,0 @@
-# CONFIG_ACPI_DPTF:
-# 
-# Intel Dynamic Platform and Thermal Framework (DPTF) is a platform
-# level hardware/software solution for power and thermal management.
-# 
-# As a container for multiple power/thermal technologies, DPTF provides
-# a coordinated approach for different policies to effect the hardware
-# state of a system.
-# 
-# For more information see:
-#
<https://01.org/intel%C2%AE-dynamic-platform-and-thermal-framework-dptf-ch...
-# 
-# Symbol: ACPI_DPTF [=n]
-# Type  : bool
-# Defined at drivers/acpi/dptf/Kconfig:3
-#   Prompt: Intel DPTF (Dynamic Platform and Thermal Framework) Support
-#   Depends on: ACPI [=y] && X86 [=y]
-#   Location:
-#     -> Power management and ACPI options
-#       -> ACPI (Advanced Configuration and Power Interface) Support (ACPI [=y])
-# 
-# 
-# 
-CONFIG_ACPI_DPTF=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_DPTF_PCH_FIVR
b/redhat/configs/fedora/generic/x86/CONFIG_DPTF_PCH_FIVR
deleted file mode 100644
index 20543f5c2c96..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_DPTF_PCH_FIVR
+++ /dev/null
@@ -1,24 +0,0 @@
-# CONFIG_DPTF_PCH_FIVR:
-# 
-# This driver adds support for Dynamic Platform and Thermal Framework
-# (DPTF) PCH FIVR Participant device support. This driver allows to
-# switch PCH FIVR (Fully Integrated Voltage Regulator) frequency.
-# This participant is responsible for exposing:
-#       freq_mhz_low_clock
-#       freq_mhz_high_clock
-# 
-# To compile this driver as a module, choose M here:
-# the module will be called dptf_pch_fivr.
-# 
-# Symbol: DPTF_PCH_FIVR [=n]
-# Type  : tristate
-# Defined at drivers/acpi/dptf/Kconfig:18
-#   Prompt: DPTF PCH FIVR Participant
-#   Depends on: ACPI [=y] && X86 [=y]
-#   Location:
-#     -> Power management and ACPI options
-#       -> ACPI (Advanced Configuration and Power Interface) Support (ACPI [=y])
-# 
-# 
-# 
-CONFIG_DPTF_PCH_FIVR=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_DPTF_POWER
b/redhat/configs/fedora/generic/x86/CONFIG_DPTF_POWER
deleted file mode 100644
index d5825880aed3..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_DPTF_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DPTF_POWER=m
diff --git a/redhat/configs/pending-common/generic/CONFIG_ACPI_DPTF
b/redhat/configs/pending-common/generic/CONFIG_ACPI_DPTF
deleted file mode 100644
index f27c7ffb3d1e..000000000000
--- a/redhat/configs/pending-common/generic/CONFIG_ACPI_DPTF
+++ /dev/null
@@ -1,24 +0,0 @@
-# CONFIG_ACPI_DPTF:
-# 
-# Intel Dynamic Platform and Thermal Framework (DPTF) is a platform
-# level hardware/software solution for power and thermal management.
-# 
-# As a container for multiple power/thermal technologies, DPTF provides
-# a coordinated approach for different policies to effect the hardware
-# state of a system.
-# 
-# For more information see:
-#
<https://01.org/intel%C2%AE-dynamic-platform-and-thermal-framework-dptf-ch...
-# 
-# Symbol: ACPI_DPTF [=n]
-# Type  : bool
-# Defined at drivers/acpi/dptf/Kconfig:3
-#   Prompt: Intel DPTF (Dynamic Platform and Thermal Framework) Support
-#   Depends on: ACPI [=y] && X86 [=y]
-#   Location:
-#     -> Power management and ACPI options
-#       -> ACPI (Advanced Configuration and Power Interface) Support (ACPI [=y])
-# 
-# 
-# 
-# CONFIG_ACPI_DPTF is not set
-- 
GitLab

[OS-BUILD PATCH 5/14] All: enable ACPI_BGRT for all ACPI platforms.

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

This only actually changes ACPI_BGRT for ark:aarch64, all
others enabled it. We want this for ark:aarch64 too as we have
upcoming aarch64 edge devices that will support this and it's
useful for boot/firmware updates.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
Cc: Mark Salter <msalter(a)redhat.com&gt;
Cc: Al Stone <ahs3(a)redhat.com&gt;
---
 redhat/configs/ark/generic/arm/aarch64/CONFIG_ACPI_BGRT          | 1 -
 .../{ark/generic/x86/x86_64 => common/generic}/CONFIG_ACPI_BGRT  | 0
 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BGRT       | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_ACPI_BGRT               | 1 -
 4 files changed, 3 deletions(-)
 delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_ACPI_BGRT
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic}/CONFIG_ACPI_BGRT
(100%)
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BGRT
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_BGRT

diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ACPI_BGRT
b/redhat/configs/ark/generic/arm/aarch64/CONFIG_ACPI_BGRT
deleted file mode 100644
index 0eb2d78651d3..000000000000
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_ACPI_BGRT
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_ACPI_BGRT is not set
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_BGRT
b/redhat/configs/common/generic/CONFIG_ACPI_BGRT
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_BGRT
rename to redhat/configs/common/generic/CONFIG_ACPI_BGRT
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BGRT
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BGRT
deleted file mode 100644
index 13035dd8275b..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_BGRT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_BGRT=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_BGRT
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_BGRT
deleted file mode 100644
index 13035dd8275b..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_BGRT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_BGRT=y
-- 
GitLab

[OS-BUILD PATCH 12/14] all: all arches/kernels enable the same DMI options

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

No functional change, all EFI platforms enable the same DMI options
so move them to common.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 redhat/configs/ark/generic/x86/x86_64/CONFIG_DMIID               | 1 -
 redhat/configs/ark/generic/x86/x86_64/CONFIG_DMI_SYSFS           | 1 -
 .../{ark/generic/arm/aarch64 => common/generic}/CONFIG_DMI       | 0
 .../{ark/generic/arm/aarch64 => common/generic}/CONFIG_DMIID     | 0
 .../{ark/generic/arm/aarch64 => common/generic}/CONFIG_DMI_SYSFS | 0
 redhat/configs/fedora/generic/arm/CONFIG_DMI                     | 1 -
 redhat/configs/fedora/generic/arm/CONFIG_DMIID                   | 1 -
 redhat/configs/fedora/generic/arm/CONFIG_DMI_SYSFS               | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_DMIID                   | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_DMI_SYSFS               | 1 -
 10 files changed, 7 deletions(-)
 delete mode 100644 redhat/configs/ark/generic/x86/x86_64/CONFIG_DMIID
 delete mode 100644 redhat/configs/ark/generic/x86/x86_64/CONFIG_DMI_SYSFS
 rename redhat/configs/{ark/generic/arm/aarch64 => common/generic}/CONFIG_DMI (100%)
 rename redhat/configs/{ark/generic/arm/aarch64 => common/generic}/CONFIG_DMIID (100%)
 rename redhat/configs/{ark/generic/arm/aarch64 => common/generic}/CONFIG_DMI_SYSFS
(100%)
 delete mode 100644 redhat/configs/fedora/generic/arm/CONFIG_DMI
 delete mode 100644 redhat/configs/fedora/generic/arm/CONFIG_DMIID
 delete mode 100644 redhat/configs/fedora/generic/arm/CONFIG_DMI_SYSFS
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_DMIID
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_DMI_SYSFS

diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_DMIID
b/redhat/configs/ark/generic/x86/x86_64/CONFIG_DMIID
deleted file mode 100644
index d0ea3622a47b..000000000000
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_DMIID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMIID=y
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_DMI_SYSFS
b/redhat/configs/ark/generic/x86/x86_64/CONFIG_DMI_SYSFS
deleted file mode 100644
index 76565caf88f7..000000000000
--- a/redhat/configs/ark/generic/x86/x86_64/CONFIG_DMI_SYSFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMI_SYSFS=y
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_DMI
b/redhat/configs/common/generic/CONFIG_DMI
similarity index 100%
rename from redhat/configs/ark/generic/arm/aarch64/CONFIG_DMI
rename to redhat/configs/common/generic/CONFIG_DMI
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_DMIID
b/redhat/configs/common/generic/CONFIG_DMIID
similarity index 100%
rename from redhat/configs/ark/generic/arm/aarch64/CONFIG_DMIID
rename to redhat/configs/common/generic/CONFIG_DMIID
diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_DMI_SYSFS
b/redhat/configs/common/generic/CONFIG_DMI_SYSFS
similarity index 100%
rename from redhat/configs/ark/generic/arm/aarch64/CONFIG_DMI_SYSFS
rename to redhat/configs/common/generic/CONFIG_DMI_SYSFS
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_DMI
b/redhat/configs/fedora/generic/arm/CONFIG_DMI
deleted file mode 100644
index f961d1678db2..000000000000
--- a/redhat/configs/fedora/generic/arm/CONFIG_DMI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMI=y
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_DMIID
b/redhat/configs/fedora/generic/arm/CONFIG_DMIID
deleted file mode 100644
index d0ea3622a47b..000000000000
--- a/redhat/configs/fedora/generic/arm/CONFIG_DMIID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMIID=y
diff --git a/redhat/configs/fedora/generic/arm/CONFIG_DMI_SYSFS
b/redhat/configs/fedora/generic/arm/CONFIG_DMI_SYSFS
deleted file mode 100644
index 76565caf88f7..000000000000
--- a/redhat/configs/fedora/generic/arm/CONFIG_DMI_SYSFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMI_SYSFS=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_DMIID
b/redhat/configs/fedora/generic/x86/CONFIG_DMIID
deleted file mode 100644
index d0ea3622a47b..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_DMIID
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMIID=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_DMI_SYSFS
b/redhat/configs/fedora/generic/x86/CONFIG_DMI_SYSFS
deleted file mode 100644
index 76565caf88f7..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_DMI_SYSFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_DMI_SYSFS=y
-- 
GitLab

[OS-BUILD PATCH 11/14] all: move SENSORS_ACPI_POWER to common/generic

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

This is modular on Fedora x86/aarch64 and ARK x86, but it's built-in
on ARK aarch64 which doesn't really make sense as it's an ACPI rev4
spec and aarch64 was only supported in ACPI 5.1 (reduced hardware model)
so it's likely it's never been supported on shipping hardware so let's
make it modular there like everywhere else.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
Cc: Mark Salter <msalter(a)redhat.com&gt;
Cc: Al Stone <ahs3(a)redhat.com&gt;
---
 redhat/configs/ark/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER | 1 -
 .../x86/x86_64 => common/generic}/CONFIG_SENSORS_ACPI_POWER      | 0
 .../configs/fedora/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_SENSORS_ACPI_POWER      | 1 -
 4 files changed, 3 deletions(-)
 delete mode 100644 redhat/configs/ark/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic}/CONFIG_SENSORS_ACPI_POWER (100%)
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_SENSORS_ACPI_POWER

diff --git a/redhat/configs/ark/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
b/redhat/configs/ark/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
deleted file mode 100644
index 6d637e9f8873..000000000000
--- a/redhat/configs/ark/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_ACPI_POWER=y
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_SENSORS_ACPI_POWER
b/redhat/configs/common/generic/CONFIG_SENSORS_ACPI_POWER
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_SENSORS_ACPI_POWER
rename to redhat/configs/common/generic/CONFIG_SENSORS_ACPI_POWER
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
deleted file mode 100644
index dbb45c01bf2c..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_SENSORS_ACPI_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_ACPI_POWER=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_SENSORS_ACPI_POWER
b/redhat/configs/fedora/generic/x86/CONFIG_SENSORS_ACPI_POWER
deleted file mode 100644
index dbb45c01bf2c..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_SENSORS_ACPI_POWER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SENSORS_ACPI_POWER=m
-- 
GitLab

[OS-BUILD PATCH 9/14] all: all ACPI platforms enable ATA_ACPI so move it to common

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 redhat/configs/{ark => common}/generic/CONFIG_ATA_ACPI    | 0
 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ATA_ACPI | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_ATA_ACPI         | 1 -
 3 files changed, 2 deletions(-)
 rename redhat/configs/{ark => common}/generic/CONFIG_ATA_ACPI (100%)
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ATA_ACPI
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ATA_ACPI

diff --git a/redhat/configs/ark/generic/CONFIG_ATA_ACPI
b/redhat/configs/common/generic/CONFIG_ATA_ACPI
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ATA_ACPI
rename to redhat/configs/common/generic/CONFIG_ATA_ACPI
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ATA_ACPI
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ATA_ACPI
deleted file mode 100644
index a0be76e56668..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ATA_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ATA_ACPI=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ATA_ACPI
b/redhat/configs/fedora/generic/x86/CONFIG_ATA_ACPI
deleted file mode 100644
index a0be76e56668..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ATA_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ATA_ACPI=y
-- 
GitLab

[OS-BUILD PATCH 13/14] fedora: User the same EFI_CUSTOM_SSDT_OVERLAYS as ARK

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

Fedora already enables ACPI_TABLE_UPGRADE so EFI_CUSTOM_SSDT_OVERLAYS doesn't
add much, it's also disabled when the kernels locked down such as for
secure boot.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 .../generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS   | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 redhat/configs/fedora/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS

diff --git a/redhat/configs/fedora/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
b/redhat/configs/fedora/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
deleted file mode 100644
index d96a45178369..000000000000
--- a/redhat/configs/fedora/generic/CONFIG_EFI_CUSTOM_SSDT_OVERLAYS
+++ /dev/null
@@ -1,19 +0,0 @@
-# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS:
-# 
-# Allow loading of an ACPI SSDT overlay from an EFI variable specified
-# by a kernel command line option.
-# 
-# See Documentation/admin-guide/acpi/ssdt-overlays.rst for more
-# information.
-# 
-# Symbol: EFI_CUSTOM_SSDT_OVERLAYS [=y]
-# Type  : bool
-# Defined at drivers/firmware/efi/Kconfig:282
-#   Prompt: Load custom ACPI SSDT overlay from an EFI variable
-#   Depends on: EFI_VARS [=y] && ACPI [=y]
-#   Location:
-#     -> Firmware Drivers
-# 
-# 
-# 
-# CONFIG_EFI_CUSTOM_SSDT_OVERLAYS is not set
-- 
GitLab

[OS-BUILD PATCH 14/14] fedora: only enable ACPI_CONFIGFS, ACPI_CUSTOM_METHOD in debug kernels

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

Like ARK does only enable these options in debug kernels, there's security
implications in particular for the later option, and they're not options
for day to day use.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
Cc: Justin M. Forbes <jforbes(a)fedoraproject.org&gt;
---
 redhat/configs/{ark => common}/debug/CONFIG_ACPI_CONFIGFS        | 0
 redhat/configs/{ark => common}/debug/CONFIG_ACPI_CUSTOM_METHOD   | 0
 redhat/configs/{ark => common}/generic/CONFIG_ACPI_CONFIGFS      | 0
 redhat/configs/{ark => common}/generic/CONFIG_ACPI_CUSTOM_METHOD | 0
 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CONFIGFS   | 1 -
 .../configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CUSTOM_METHOD | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_ACPI_CONFIGFS           | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_ACPI_CUSTOM_METHOD      | 1 -
 8 files changed, 4 deletions(-)
 rename redhat/configs/{ark => common}/debug/CONFIG_ACPI_CONFIGFS (100%)
 rename redhat/configs/{ark => common}/debug/CONFIG_ACPI_CUSTOM_METHOD (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_CONFIGFS (100%)
 rename redhat/configs/{ark => common}/generic/CONFIG_ACPI_CUSTOM_METHOD (100%)
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CONFIGFS
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CUSTOM_METHOD
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_CONFIGFS
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI_CUSTOM_METHOD

diff --git a/redhat/configs/ark/debug/CONFIG_ACPI_CONFIGFS
b/redhat/configs/common/debug/CONFIG_ACPI_CONFIGFS
similarity index 100%
rename from redhat/configs/ark/debug/CONFIG_ACPI_CONFIGFS
rename to redhat/configs/common/debug/CONFIG_ACPI_CONFIGFS
diff --git a/redhat/configs/ark/debug/CONFIG_ACPI_CUSTOM_METHOD
b/redhat/configs/common/debug/CONFIG_ACPI_CUSTOM_METHOD
similarity index 100%
rename from redhat/configs/ark/debug/CONFIG_ACPI_CUSTOM_METHOD
rename to redhat/configs/common/debug/CONFIG_ACPI_CUSTOM_METHOD
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_CONFIGFS
b/redhat/configs/common/generic/CONFIG_ACPI_CONFIGFS
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_CONFIGFS
rename to redhat/configs/common/generic/CONFIG_ACPI_CONFIGFS
diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_CUSTOM_METHOD
b/redhat/configs/common/generic/CONFIG_ACPI_CUSTOM_METHOD
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_CUSTOM_METHOD
rename to redhat/configs/common/generic/CONFIG_ACPI_CUSTOM_METHOD
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CONFIGFS
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CONFIGFS
deleted file mode 100644
index fc2af2c0bb0d..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CONFIGFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CONFIGFS=m
diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CUSTOM_METHOD
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CUSTOM_METHOD
deleted file mode 100644
index 76853b6d8224..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_ACPI_CUSTOM_METHOD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CUSTOM_METHOD=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CONFIGFS
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CONFIGFS
deleted file mode 100644
index fc2af2c0bb0d..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CONFIGFS
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CONFIGFS=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CUSTOM_METHOD
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CUSTOM_METHOD
deleted file mode 100644
index 76853b6d8224..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI_CUSTOM_METHOD
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI_CUSTOM_METHOD=m
-- 
GitLab

[OS-BUILD PATCH 10/14] fedora: PCIE_HISI_ERR is already in common

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

No chnage, just removes an option already set the same in common

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 .../generic/arm/aarch64/CONFIG_PCIE_HISI_ERR   | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 redhat/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_HISI_ERR

diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_HISI_ERR
b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_HISI_ERR
deleted file mode 100644
index 502c3e8bf5b5..000000000000
--- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_PCIE_HISI_ERR
+++ /dev/null
@@ -1,18 +0,0 @@
-# CONFIG_PCIE_HISI_ERR:
-# 
-# Say Y here if you want error handling support
-# for the PCIe controller's errors on HiSilicon HIP SoCs
-# 
-# Symbol: PCIE_HISI_ERR [=n]
-# Type  : bool
-# Defined at drivers/pci/controller/Kconfig:301
-#   Prompt: HiSilicon HIP PCIe controller error handling driver
-#   Depends on: PCI [=y] && ACPI_APEI_GHES [=y] && (ARM64 [=y] ||
COMPILE_TEST [=n])
-#   Location:
-#     -> Device Drivers
-#       -> PCI support (PCI [=y])
-#         -> PCI controller drivers
-# 
-# 
-# 
-# CONFIG_PCIE_HISI_ERR is not set
-- 
GitLab

[OS-BUILD PATCH 8/14] all: x86: move shared x86 acpi config options to generic

[GitLab Bridge on behalf of pbrobinson]

From: Peter Robinson <pbrobinson(a)redhat.com&gt;

No functional change, just move the x86 acpi configs that Fedora/ARK
share to the common location.

Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com&gt;
---
 redhat/configs/ark/generic/{ => x86/x86_64}/CONFIG_ACPI_TOSHIBA  | 0
 .../{ark/generic/x86/x86_64 => common/generic/x86}/CONFIG_ACPI   | 0
 .../x86/x86_64 => common/generic/x86}/CONFIG_MFD_INTEL_LPSS_ACPI | 0
 .../generic/x86/x86_64 => common/generic/x86}/CONFIG_PNPACPI     | 0
 .../generic/x86}/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI         | 0
 .../x86/x86_64 => common/generic/x86}/CONFIG_THINKPAD_ACPI       | 0
 .../generic/x86}/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT               | 0
 .../x86/x86_64 => common/generic/x86}/CONFIG_THINKPAD_ACPI_DEBUG | 0
 .../generic/x86}/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES            | 0
 .../generic/x86}/CONFIG_THINKPAD_ACPI_HOTKEY_POLL                | 0
 .../generic/x86}/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS                | 0
 .../x86/x86_64 => common/generic/x86}/CONFIG_THINKPAD_ACPI_VIDEO | 0
 .../x86/x86_64 => common/generic/x86}/CONFIG_X86_ACPI_CPUFREQ    | 0
 .../x86_64 => common/generic/x86}/CONFIG_X86_ACPI_CPUFREQ_CPB    | 0
 redhat/configs/fedora/generic/x86/CONFIG_ACPI                    | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_PNPACPI                 | 1 -
 .../fedora/generic/x86/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI   | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI           | 1 -
 .../configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUG     | 1 -
 .../fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES      | 1 -
 .../configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL  | 1 -
 .../configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS  | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_VIDEO     | 1 -
 redhat/configs/fedora/generic/x86/CONFIG_X86_ACPI_CPUFREQ_CPB    | 1 -
 25 files changed, 11 deletions(-)
 rename redhat/configs/ark/generic/{ => x86/x86_64}/CONFIG_ACPI_TOSHIBA (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic/x86}/CONFIG_ACPI
(100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_MFD_INTEL_LPSS_ACPI (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 => common/generic/x86}/CONFIG_PNPACPI
(100%)
 rename redhat/configs/{ark/generic =>
common/generic/x86}/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_THINKPAD_ACPI (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_THINKPAD_ACPI_DEBUG (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_THINKPAD_ACPI_HOTKEY_POLL (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_THINKPAD_ACPI_VIDEO (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_X86_ACPI_CPUFREQ (100%)
 rename redhat/configs/{ark/generic/x86/x86_64 =>
common/generic/x86}/CONFIG_X86_ACPI_CPUFREQ_CPB (100%)
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_ACPI
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_PNPACPI
 delete mode 100644
redhat/configs/fedora/generic/x86/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUG
 delete mode 100644
redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_VIDEO
 delete mode 100644 redhat/configs/fedora/generic/x86/CONFIG_X86_ACPI_CPUFREQ_CPB

diff --git a/redhat/configs/ark/generic/CONFIG_ACPI_TOSHIBA
b/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_TOSHIBA
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_ACPI_TOSHIBA
rename to redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI_TOSHIBA
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI
b/redhat/configs/common/generic/x86/CONFIG_ACPI
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_ACPI
rename to redhat/configs/common/generic/x86/CONFIG_ACPI
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_MFD_INTEL_LPSS_ACPI
b/redhat/configs/common/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_MFD_INTEL_LPSS_ACPI
rename to redhat/configs/common/generic/x86/CONFIG_MFD_INTEL_LPSS_ACPI
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_PNPACPI
b/redhat/configs/common/generic/x86/CONFIG_PNPACPI
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_PNPACPI
rename to redhat/configs/common/generic/x86/CONFIG_PNPACPI
diff --git a/redhat/configs/ark/generic/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI
b/redhat/configs/common/generic/x86/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI
similarity index 100%
rename from redhat/configs/ark/generic/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI
rename to redhat/configs/common/generic/x86/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI
b/redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI
rename to redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
b/redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
rename to redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_DEBUG
b/redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_DEBUG
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_DEBUG
rename to redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_DEBUG
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
b/redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
rename to redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
b/redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
rename to redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
b/redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
rename to redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_VIDEO
b/redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_VIDEO
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_THINKPAD_ACPI_VIDEO
rename to redhat/configs/common/generic/x86/CONFIG_THINKPAD_ACPI_VIDEO
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_X86_ACPI_CPUFREQ
b/redhat/configs/common/generic/x86/CONFIG_X86_ACPI_CPUFREQ
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_X86_ACPI_CPUFREQ
rename to redhat/configs/common/generic/x86/CONFIG_X86_ACPI_CPUFREQ
diff --git a/redhat/configs/ark/generic/x86/x86_64/CONFIG_X86_ACPI_CPUFREQ_CPB
b/redhat/configs/common/generic/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
similarity index 100%
rename from redhat/configs/ark/generic/x86/x86_64/CONFIG_X86_ACPI_CPUFREQ_CPB
rename to redhat/configs/common/generic/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_ACPI
b/redhat/configs/fedora/generic/x86/CONFIG_ACPI
deleted file mode 100644
index 839566bae001..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ACPI=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_PNPACPI
b/redhat/configs/fedora/generic/x86/CONFIG_PNPACPI
deleted file mode 100644
index 02d6f696ebc4..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_PNPACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_PNPACPI=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI
b/redhat/configs/fedora/generic/x86/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI
deleted file mode 100644
index a371306cb5d4..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI
b/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI
deleted file mode 100644
index b56a7701d5d1..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THINKPAD_ACPI=m
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
b/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
deleted file mode 100644
index 5b406b9baa4f..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_ALSA_SUPPORT
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUG
b/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUG
deleted file mode 100644
index 10e6eb6a70fa..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUG
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
b/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
deleted file mode 100644
index 0673591f5ac3..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_DEBUGFACILITIES
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
b/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
deleted file mode 100644
index cf6a85819368..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_HOTKEY_POLL
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
b/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
deleted file mode 100644
index 535380b27802..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_UNSAFE_LEDS
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_VIDEO
b/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_VIDEO
deleted file mode 100644
index a13ebc06be53..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_THINKPAD_ACPI_VIDEO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_THINKPAD_ACPI_VIDEO=y
diff --git a/redhat/configs/fedora/generic/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
b/redhat/configs/fedora/generic/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
deleted file mode 100644
index db5a9b22be53..000000000000
--- a/redhat/configs/fedora/generic/x86/CONFIG_X86_ACPI_CPUFREQ_CPB
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_X86_ACPI_CPUFREQ_CPB=y
-- 
GitLab

[Al Stone]

On 29 Dec 2020 16:07, GitLab Bridge on behalf of pbrobinson wrote:
>  From: pbrobinson on gitlab.com
>  
>  Clean up the duplicated ACPI options across Fedora and ARK kernels. The
>  two architectures supported are aarc64/x86. Putting these options in
>  common/generic and common/debug doesn't affect non ACPI architectures
>  due to CONFIG_ACPI and associated Kconfig deps. The first big commit
>  doesn't change anything just moves the duplicated options to common/ and
>  removes the dupes.
>  
>  From there each of the patches are documented, some remove dead options,
>  some adjust things like ACPI_EC_DEBUGFS that make sense for security and
>  so platforms aren't accidentally bricked. There's a couple that change
>  ark/aarch64 with appropriate maintainers cc:ed and really just bring it
>  inline with other arches, and finally there's a few minor Fedora tweaks
>  with Justin cc:ed in. 
All LGTM.  Thanks for the cleanup, Peter.  Excellent idea.

Acked-by: Al Stone <ahs3(a)redhat.com&gt;

-- 
ciao,
al
-----------------------------------
Al Stone
Software Engineer
Red Hat, Inc.
ahs3(a)redhat.com
-----------------------------------

[GitLab Bridge on behalf of CKI Bot]

From: CKI Bot on gitlab.com
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/838#note_48322...

ACK/NACK Summary: NeedsReview - ACKed by Al Stone <ahs3(a)redhat.com&gt;.
Requires at least 1 ACK(s) from someone in the set herton(a)redhat.com*,
williams(a)redhat.com*, jforbes(a)redhat.com*, rvrbovsk(a)redhat.com*,
trix(a)redhat.com*, dzickus(a)redhat.com*, dvlasenk(a)redhat.com*,
bmasney(a)redhat.com*, jlelli(a)redhat.com*, fhrbata(a)redhat.com*,
lgoncalv(a)redhat.com*, ptalbert(a)redhat.com*, acaringi(a)redhat.com*,
jstancek(a)redhat.com*, bmeneg(a)redhat.com*. Code owners are marked with a
*.