From: Prarit Bhargava <prarit@xxxxxxxxxx> redhat/configs/common: Remove x86_64 directory Remove the x86_64 directories. CONFIG_EDAC_AMD64 existed in both x86 and x86_64. The value in the file now reflects the x86 64-bit variant. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> diff --git a/redhat/configs/common/debug/x86/x86_64/CONFIG_INTEL_IOMMU_DEBUGFS b/redhat/configs/common/debug/x86/CONFIG_INTEL_IOMMU_DEBUGFS rename from redhat/configs/common/debug/x86/x86_64/CONFIG_INTEL_IOMMU_DEBUGFS rename to redhat/configs/common/debug/x86/CONFIG_INTEL_IOMMU_DEBUGFS index blahblah..blahblah 100644 --- a/redhat/configs/common/debug/x86/x86_64/CONFIG_INTEL_IOMMU_DEBUGFS +++ b/redhat/configs/common/debug/x86/CONFIG_INTEL_IOMMU_DEBUGFS diff --git a/redhat/configs/common/debug/x86/x86_64/README b/redhat/configs/common/debug/x86/README rename from redhat/configs/common/debug/x86/x86_64/README rename to redhat/configs/common/debug/x86/README index blahblah..blahblah 100644 --- a/redhat/configs/common/debug/x86/x86_64/README +++ b/redhat/configs/common/debug/x86/README diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY b/redhat/configs/common/generic/x86/CONFIG_ACPI_HOTPLUG_MEMORY rename from redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY rename to redhat/configs/common/generic/x86/CONFIG_ACPI_HOTPLUG_MEMORY index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_ACPI_HOTPLUG_MEMORY +++ b/redhat/configs/common/generic/x86/CONFIG_ACPI_HOTPLUG_MEMORY diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_IOMMU b/redhat/configs/common/generic/x86/CONFIG_AMD_IOMMU rename from redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_IOMMU rename to redhat/configs/common/generic/x86/CONFIG_AMD_IOMMU index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_IOMMU +++ b/redhat/configs/common/generic/x86/CONFIG_AMD_IOMMU diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_IOMMU_V2 b/redhat/configs/common/generic/x86/CONFIG_AMD_IOMMU_V2 rename from redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_IOMMU_V2 rename to redhat/configs/common/generic/x86/CONFIG_AMD_IOMMU_V2 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_IOMMU_V2 +++ b/redhat/configs/common/generic/x86/CONFIG_AMD_IOMMU_V2 diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT b/redhat/configs/common/generic/x86/CONFIG_AMD_MEM_ENCRYPT rename from redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT rename to redhat/configs/common/generic/x86/CONFIG_AMD_MEM_ENCRYPT index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT +++ b/redhat/configs/common/generic/x86/CONFIG_AMD_MEM_ENCRYPT diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT b/redhat/configs/common/generic/x86/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT rename from redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT rename to redhat/configs/common/generic/x86/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT +++ b/redhat/configs/common/generic/x86/CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_NUMA b/redhat/configs/common/generic/x86/CONFIG_AMD_NUMA rename from redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_NUMA rename to redhat/configs/common/generic/x86/CONFIG_AMD_NUMA index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_NUMA +++ b/redhat/configs/common/generic/x86/CONFIG_AMD_NUMA diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_PTDMA b/redhat/configs/common/generic/x86/CONFIG_AMD_PTDMA rename from redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_PTDMA rename to redhat/configs/common/generic/x86/CONFIG_AMD_PTDMA index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_PTDMA +++ b/redhat/configs/common/generic/x86/CONFIG_AMD_PTDMA diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_SFH_HID b/redhat/configs/common/generic/x86/CONFIG_AMD_SFH_HID rename from redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_SFH_HID rename to redhat/configs/common/generic/x86/CONFIG_AMD_SFH_HID index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_AMD_SFH_HID +++ b/redhat/configs/common/generic/x86/CONFIG_AMD_SFH_HID diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE b/redhat/configs/common/generic/x86/CONFIG_ARCH_MEMORY_PROBE rename from redhat/configs/common/generic/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE rename to redhat/configs/common/generic/x86/CONFIG_ARCH_MEMORY_PROBE index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_ARCH_MEMORY_PROBE +++ b/redhat/configs/common/generic/x86/CONFIG_ARCH_MEMORY_PROBE diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_CMA b/redhat/configs/common/generic/x86/CONFIG_CMA rename from redhat/configs/common/generic/x86/x86_64/CONFIG_CMA rename to redhat/configs/common/generic/x86/CONFIG_CMA index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_CMA +++ b/redhat/configs/common/generic/x86/CONFIG_CMA diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_COUNTER b/redhat/configs/common/generic/x86/CONFIG_COUNTER rename from redhat/configs/common/generic/x86/x86_64/CONFIG_COUNTER rename to redhat/configs/common/generic/x86/CONFIG_COUNTER index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_COUNTER +++ b/redhat/configs/common/generic/x86/CONFIG_COUNTER diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_BLAKE2S_X86 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_BLAKE2S_X86 rename from redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_BLAKE2S_X86 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_BLAKE2S_X86 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_BLAKE2S_X86 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_BLAKE2S_X86 diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_BLOWFISH_X86_64 rename from redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_BLOWFISH_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_BLOWFISH_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_BLOWFISH_X86_64 diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 rename from redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64 diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 rename from redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64 diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAMELLIA_X86_64 rename from redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAMELLIA_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAMELLIA_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAMELLIA_X86_64 diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAST5_AVX_X86_64 rename from redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAST5_AVX_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAST5_AVX_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAST5_AVX_X86_64 diff --git a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64 b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAST6_AVX_X86_64 rename from redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64 rename to redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAST6_AVX_X86_64 index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/x86/x86_64/CONFIG_CRYPTO_CAST6_AVX_X86_64 +++ b/redhat/configs/common/generic/x86/CONFIG_CRYPTO_CAST6_AVX_X86_64 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2030 _______________________________________________ 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