From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Rename rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER in configs
Upstream commit 0192445cb2f7e renamed FORCE_MAX_ZONEORDER to
ARCH_FORCE_MAX_ORDER which made it appear as a new config item for us in
pending. While I have fixed up pending, this MR just fixes up the
proper config locations. All values for ARCH_FORCE_MAX_ORDER match the
values for FORCE_MAX_ZONEORDER which were valid before this MR. It is a
simple rename with no functional change to the config.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
rename from redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
rename to redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
index blahblah..blahblah 100644
--- a/redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
+++ b/redhat/configs/common/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
diff --git a/redhat/configs/common/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
b/redhat/configs/common/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/arm/aarch64/CONFIG_FORCE_MAX_ZONEORDER
+++ /dev/null
@@ -1,3 +0,0 @@
-# This relies on an out of tree patch to arch/arm64/Kconfig
-# Otherwise, we would be stuck with a default of 11
-CONFIG_FORCE_MAX_ZONEORDER=13
diff --git a/redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
b/redhat/configs/common/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
rename from redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
rename to redhat/configs/common/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
index blahblah..blahblah 100644
--- a/redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
+++ b/redhat/configs/common/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
diff --git a/redhat/configs/common/generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER
b/redhat/configs/common/generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/common/generic/powerpc/CONFIG_FORCE_MAX_ZONEORDER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FORCE_MAX_ZONEORDER=9
diff --git a/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
b/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_FORCE_MAX_ORDER=13
diff --git a/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
b/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_ARCH_FORCE_MAX_ORDER=9
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2090