From: Vladis Dronov on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1855
Brush up s390x/zfcpdump/ configs. See an exact description of actions in commit messages related. Resulting generated config files are identical before and after this patchset.
Signed-off-by: Vladis Dronov vdronov@redhat.com
--- redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN => redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN | 0 redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_GENERIC => redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_GENERIC | 0 redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_INLINE => redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_INLINE | 0 redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_VMALLOC => redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_VMALLOC | 0 redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ATM | 1 - redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRAMFS | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_BLAKE2B => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_BLAKE2B | 0 redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CMAC | 1 - redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CTS | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ESSIV => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ESSIV | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 | 0 redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_OFB | 1 - redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3 | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_256_S390 => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_256_S390 | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_512_S390 => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_512_S390 | 0 redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_XTS | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ZSTD => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ZSTD | 0 redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_KERNEL | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_EXFAT_FS => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_EXFAT_FS | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_ASYMMETRIC_KEYS => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_ASYMMETRIC_KEYS | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_PLATFORM_KEYRING => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_PLATFORM_KEYRING | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_SIGNATURE => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_SIGNATURE | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KUNIT => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KUNIT | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KUNIT_ALL_TESTS => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KUNIT_ALL_TESTS | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_NETFS_SUPPORT => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NETFS_SUPPORT | 0 redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NETLINK_DIAG | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_PAGE_EXTENSION => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_PAGE_EXTENSION | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_PAGE_OWNER => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_PAGE_OWNER | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_REF_SCALE_TEST => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_REF_SCALE_TEST | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_SCALE_TEST => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_SCALE_TEST | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_RCU_TORTURE_TEST | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_SIGNATURE => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_SIGNATURE | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_SYSTEM_DATA_VERIFICATION => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_SYSTEM_DATA_VERIFICATION | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_VDPA => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_VDPA | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_VFIO => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_VFIO | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_VHOST_VDPA => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_VHOST_VDPA | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_VIRTIO_CONSOLE => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_VIRTIO_CONSOLE | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_VIRTIO_VDPA => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_VIRTIO_VDPA | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_WIREGUARD => redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_WIREGUARD | 0 redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20 | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_CHACHA20POLY1305 | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 | 1 - redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_POLY1305 | 1 - 48 files changed, 0 insertions(+), 14 deletions(-)
From: Vladis Dronov vdronov@redhat.com
Move common/generic/s390x/zfcpdump/ configs to ark/generic/s390x/zfcpdump/
As Justin mentions, Fedora does not build zfcpdump flavor. common/ is for things which are identical between Fedora and RHEL/ARK. The ark/ directory is for things that are only set that way in RHEL/ARK. For the first year or so of the new kernel workflow, all new RHEL zfcpdump entries were created in common/ instead of ark/. That only has changed a few months ago. So fix this now.
Signed-off-by: Vladis Dronov vdronov@redhat.com
diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_BLAKE2B b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_BLAKE2B rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_BLAKE2B rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_BLAKE2B index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_BLAKE2B +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_BLAKE2B diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ECDSA diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ESSIV b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ESSIV rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ESSIV rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ESSIV index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ESSIV +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ESSIV diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_BLAKE2S diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA20POLY1305 diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CURVE25519 diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_256_S390 b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_256_S390 rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_256_S390 rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_256_S390 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_256_S390 +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_256_S390 diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_512_S390 b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_512_S390 rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_512_S390 rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_512_S390 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_512_S390 +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3_512_S390 diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ZSTD b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ZSTD rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ZSTD rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ZSTD index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_CRYPTO_ZSTD +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_ZSTD diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_EXFAT_FS b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_EXFAT_FS rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_EXFAT_FS rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_EXFAT_FS index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_EXFAT_FS +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_EXFAT_FS diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_ASYMMETRIC_KEYS b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_ASYMMETRIC_KEYS rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_ASYMMETRIC_KEYS rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_ASYMMETRIC_KEYS index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_ASYMMETRIC_KEYS +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_ASYMMETRIC_KEYS diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_PLATFORM_KEYRING b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_PLATFORM_KEYRING rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_PLATFORM_KEYRING rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_PLATFORM_KEYRING index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_PLATFORM_KEYRING +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_PLATFORM_KEYRING diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_SIGNATURE b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_SIGNATURE rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_SIGNATURE rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_SIGNATURE index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_INTEGRITY_SIGNATURE +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_INTEGRITY_SIGNATURE diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KEXEC_SIG diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KUNIT b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KUNIT rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KUNIT rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KUNIT index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KUNIT +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KUNIT diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KUNIT_ALL_TESTS b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KUNIT_ALL_TESTS rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KUNIT_ALL_TESTS rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KUNIT_ALL_TESTS index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_KUNIT_ALL_TESTS +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_KUNIT_ALL_TESTS diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_NETFS_SUPPORT b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NETFS_SUPPORT rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_NETFS_SUPPORT rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NETFS_SUPPORT index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_NETFS_SUPPORT +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NETFS_SUPPORT diff --git a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_PAGE_EXTENSION b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_PAGE_EXTENSION rename from redhat/configs/common/generic/s390x/zfcpdump/CONFIG_PAGE_EXTENSION rename to redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_PAGE_EXTENSION index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/s390x/zfcpdump/CONFIG_PAGE_EXTENSION +++ b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_PAGE_EXTENSION
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1855
From: Vladis Dronov vdronov@redhat.com
Move common/debug/s390x/zfcpdump/ configs to ark/debug/s390x/zfcpdump/
As Justin mentions, Fedora does not build zfcpdump flavor. common/ is for things which are identical between Fedora and RHEL/ARK. The ark/ directory is for things that are only set that way in RHEL/ARK. For the first year or so of the new kernel workflow, all new RHEL zfcpdump entries were created in common/ instead of ark/. That only has changed a few months ago. So fix this now.
Signed-off-by: Vladis Dronov vdronov@redhat.com
diff --git a/redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN b/redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN rename from redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN rename to redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN index blahblah..blahblah 100644 --- a/redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN +++ b/redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN diff --git a/redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_GENERIC b/redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_GENERIC rename from redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_GENERIC rename to redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_GENERIC index blahblah..blahblah 100644 --- a/redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_GENERIC +++ b/redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_GENERIC diff --git a/redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_INLINE b/redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_INLINE rename from redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_INLINE rename to redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_INLINE index blahblah..blahblah 100644 --- a/redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_INLINE +++ b/redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_INLINE diff --git a/redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_VMALLOC b/redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_VMALLOC rename from redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_VMALLOC rename to redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_VMALLOC index blahblah..blahblah 100644 --- a/redhat/configs/common/debug/s390x/zfcpdump/CONFIG_KASAN_VMALLOC +++ b/redhat/configs/ark/debug/s390x/zfcpdump/CONFIG_KASAN_VMALLOC
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1855
From: Vladis Dronov vdronov@redhat.com
Remove duplicates from ark/generic/s390x/zfcpdump/
Remove configs from ark/generic/s390x/zfcpdump/ which are identical to the same configs in ark/generic/s390x/, ark/generic/, common/generic/s390x and common/generic/.
Signed-off-by: Vladis Dronov vdronov@redhat.com
diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ATM b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ATM deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_ATM +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_ATM is not set diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRAMFS b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRAMFS deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRAMFS +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_CRAMFS is not set diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CMAC b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CMAC deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CMAC +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_CMAC=y diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CTS b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CTS deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_CTS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_CTS=y diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_CHACHA +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_LIB_CHACHA=y diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_LIB_POLY1305 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_LIB_POLY1305=y diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_OFB b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_OFB deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_OFB +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_OFB=y diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3 b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3 deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_SHA3 +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_SHA3=y diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_XTS b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_XTS deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_CRYPTO_XTS +++ /dev/null @@ -1 +0,0 @@ -CONFIG_CRYPTO_XTS=y diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_KERNEL b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_KERNEL deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_DEBUG_KERNEL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_DEBUG_KERNEL=y diff --git a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NETLINK_DIAG b/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NETLINK_DIAG deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/ark/generic/s390x/zfcpdump/CONFIG_NETLINK_DIAG +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NETLINK_DIAG=y
-- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1855
From: Justin M. Forbes on gitlab.com https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1855#note_9739661...
Thanks for doing this.
kernel@lists.fedoraproject.org
-
Justin M. Forbes (via Email Bridge) -
Vladis Dronov (via Email Bridge)