[OS-BUILD PATCH 1/8] Rename rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER in pending

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



From: Justin M. Forbes <jforbes@xxxxxxxxxxxxxxxxx>

Rename rename FORCE_MAX_ZONEORDER to ARCH_FORCE_MAX_ORDER in pending

Upstream commit 0192445cb2f7e renamed FORCE_MAX_ZONEORDER to
ARCH_FORCE_MAX_ORDER which appeared as a new config item set to defaults
for us. Unfortunately those defaults do not match what is needed.  This
fixes up pending to get rid of the mismatch. I will adjust the MR to do
the right thing overall.

Signed-off-by: Justin M. Forbes <jforbes@xxxxxxxxxxxxxxxxx>

diff --git a/redhat/configs/fedora/generic/arm/armv7/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/fedora/generic/arm/armv7/CONFIG_ARCH_FORCE_MAX_ORDER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/fedora/generic/arm/armv7/CONFIG_ARCH_FORCE_MAX_ORDER
@@ -0,0 +1 @@
+CONFIG_ARCH_FORCE_MAX_ORDER=11
diff --git a/redhat/configs/fedora/generic/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER b/redhat/configs/fedora/generic/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/fedora/generic/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FORCE_MAX_ZONEORDER=11
diff --git a/redhat/configs/pending-ark/generic/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/pending-ark/generic/CONFIG_ARCH_FORCE_MAX_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-ark/generic/CONFIG_ARCH_FORCE_MAX_ORDER
+++ /dev/null
@@ -1,12 +0,0 @@
-# Symbol: ARCH_FORCE_MAX_ORDER [=9]
-# Type  : integer
-# Range : [8 9]
-# Defined at arch/powerpc/Kconfig:849
-#   Prompt: Maximum zone order
-#   Location:
-#     Main menu
-#       -> Kernel options
-# 
-# 
-# 
-CONFIG_ARCH_FORCE_MAX_ORDER=9
diff --git a/redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/pending-ark/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
@@ -0,0 +1 @@
+CONFIG_ARCH_FORCE_MAX_ORDER=13
diff --git a/redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/pending-ark/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
@@ -0,0 +1 @@
+CONFIG_ARCH_FORCE_MAX_ORDER=9
diff --git a/redhat/configs/pending-fedora/generic/CONFIG_ARCH_FORCE_MAX_ORDER b/redhat/configs/pending-fedora/generic/CONFIG_ARCH_FORCE_MAX_ORDER
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-fedora/generic/CONFIG_ARCH_FORCE_MAX_ORDER
+++ /dev/null
@@ -1,12 +0,0 @@
-# Symbol: ARCH_FORCE_MAX_ORDER [=9]
-# Type  : integer
-# Range : [8 9]
-# Defined at arch/powerpc/Kconfig:849
-#   Prompt: Maximum zone order
-#   Location:
-#     Main menu
-#       -> Kernel options
-# 
-# 
-# 
-CONFIG_ARCH_FORCE_MAX_ORDER=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
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/pending-fedora/generic/arm/aarch64/CONFIG_ARCH_FORCE_MAX_ORDER
@@ -0,0 +1 @@
+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
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/pending-fedora/generic/powerpc/CONFIG_ARCH_FORCE_MAX_ORDER
@@ -0,0 +1 @@
+CONFIG_ARCH_FORCE_MAX_ORDER=9

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2095
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue




[Index of Archives]     [Fedora General Discussion]     [Older Fedora Users Archive]     [Fedora Advisory Board]     [Fedora Security]     [Fedora Devel Java]     [Fedora Legacy]     [Fedora Desktop]     [ATA RAID]     [Fedora Marketing]     [Fedora Mentors]     [Fedora Package Announce]     [Fedora Package Review]     [Fedora Music]     [Fedora Packaging]     [Centos]     [Fedora SELinux]     [Coolkey]     [Yum Users]     [Tux]     [Yosemite News]     [KDE Users]     [Fedora Art]     [Fedora Docs]     [USB]     [Asterisk PBX]

  Powered by Linux