[OS-BUILD PATCH] redhat/configs: Move ark/generic/s390x/CONFIG_ZSMALLOC to common/generic
From: Waiman Long longman@redhat.com
redhat/configs: Move ark/generic/s390x/CONFIG_ZSMALLOC to common/generic
Commit 3f72c8eb03cb ("Fix up ZSMALLOC config for s390") added s390x specific CONFIG_ZSMALLOC to resolve config generation problem due to upcommit commit b3fbd58fcbb1 ("mm: Kconfig: simplify zswap configuration"). As this commit is being backported to centos-stream-9 with similar config changes into the common/generic directory. It makes sense to move the ark/generic config files to common/generic too.
Signed-off-by: Waiman Long longman@redhat.com
diff --git a/redhat/configs/ark/generic/s390x/CONFIG_ZSMALLOC b/redhat/configs/common/generic/s390x/CONFIG_ZSMALLOC rename from redhat/configs/ark/generic/s390x/CONFIG_ZSMALLOC rename to redhat/configs/common/generic/s390x/CONFIG_ZSMALLOC index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/s390x/CONFIG_ZSMALLOC +++ b/redhat/configs/common/generic/s390x/CONFIG_ZSMALLOC diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_ZSMALLOC rename from redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC rename to redhat/configs/common/generic/s390x/zfcpdump/CONFIG_ZSMALLOC index blahblah..blahblah 100644 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ZSMALLOC +++ b/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_ZSMALLOC
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2127
From: Patrick Talbert on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2127#note_1162096...
/block
From: Patrick Talbert on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2127#note_1174323...
@llong1 kernel-ark actually sets this config option the same way as your redhat/centos-stream/src/kernel/centos-stream-9!1557. The only difference is your centos MR does it under the common/ directory while in kernel-ark the option is set under the ark/ directory. But the generated setting for CONFIG_ZSMALLOC will be the same for the rhel flavour under both projects.
We've updated @prarit's script so it is better about detecting these cases and will no longer post a warning comment.
So really I think this MR can be closed because it is effectively a noop.
From: Waiman Long on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2127#note_1174604...
Yes, it is essentially a noop. Will close this MR. Thanks!
kernel@lists.fedoraproject.org
-
Patrick Talbert (via Email Bridge) -
Waiman Long (via Email Bridge)