From: Dan Horák on
gitlab.com
Merge Request:
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1907
NOTE: Truncated patchset due to missing public @redhat.com email
address on your GitLab profile at
https://gitlab.com/-/profile.
Once that is fixed, close and reopen the merge request to
retrigger sending the emails.
https://fedoraproject.org/wiki/Changes/z13BaselineForIBMZ
waiting for FESCo approval
diff for the generated configs
````
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 34499aeae..96dd1f05b 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -3115,7 +3115,7 @@ CONFIG_MAGIC_SYSRQ=y
# CONFIG_MANAGER_SBS is not set
CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z10 is not set
-# CONFIG_MARCH_Z13 is not set
+CONFIG_MARCH_Z13=y
# CONFIG_MARCH_Z14 is not set
# CONFIG_MARCH_Z15 is not set
# CONFIG_MARCH_Z16 is not set
@@ -3123,7 +3123,7 @@ CONFIG_MANTIS_CORE=m
# CONFIG_MARCH_Z900 is not set
# CONFIG_MARCH_Z9_109 is not set
# CONFIG_MARCH_Z990 is not set
-CONFIG_MARCH_ZEC12=y
+# CONFIG_MARCH_ZEC12 is not set
CONFIG_MARVELL_10G_PHY=m
CONFIG_MARVELL_88X2222_PHY=m
# CONFIG_MARVELL_CN10K_TAD_PMU is not set
````
---
redhat/configs/ark/generic/s390x/CONFIG_MARCH_ZEC12 =>
redhat/configs/common/generic/s390x/CONFIG_MARCH_ZEC12 | 0
redhat/configs/ark/generic/CONFIG_MARCH_Z16 =>
redhat/configs/common/generic/CONFIG_MARCH_Z16 | 0
redhat/configs/fedora/generic/s390x/CONFIG_MARCH_Z13
| 1 +
redhat/configs/fedora/generic/s390x/CONFIG_MARCH_Z16
| 1 -
redhat/configs/fedora/generic/s390x/CONFIG_MARCH_ZEC12
| 1 -
5 files changed, 1 insertions(+), 2 deletions(-)