From: Peter Robinson <pbrobinson@xxxxxxxxx> generic: cleanup the NVDIMM options The NVDIMM options are the same across RHEL and most of Fedora (potentially slight tweaks on s390x) so de-dupe the configs so they're easier to follow. Signed-off-by: Peter Robinson <pbrobinson@xxxxxxxxx> diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_LIBNVDIMM b/redhat/configs/common/generic/CONFIG_LIBNVDIMM rename from redhat/configs/fedora/generic/arm/aarch64/CONFIG_LIBNVDIMM rename to redhat/configs/common/generic/CONFIG_LIBNVDIMM index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_LIBNVDIMM +++ b/redhat/configs/common/generic/CONFIG_LIBNVDIMM diff --git a/redhat/configs/common/generic/powerpc/CONFIG_NVDIMM_DAX b/redhat/configs/common/generic/CONFIG_NVDIMM_DAX rename from redhat/configs/common/generic/powerpc/CONFIG_NVDIMM_DAX rename to redhat/configs/common/generic/CONFIG_NVDIMM_DAX index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/powerpc/CONFIG_NVDIMM_DAX +++ b/redhat/configs/common/generic/CONFIG_NVDIMM_DAX diff --git a/redhat/configs/common/generic/powerpc/CONFIG_NVDIMM_PFN b/redhat/configs/common/generic/CONFIG_NVDIMM_PFN rename from redhat/configs/common/generic/powerpc/CONFIG_NVDIMM_PFN rename to redhat/configs/common/generic/CONFIG_NVDIMM_PFN index blahblah..blahblah 100644 --- a/redhat/configs/common/generic/powerpc/CONFIG_NVDIMM_PFN +++ b/redhat/configs/common/generic/CONFIG_NVDIMM_PFN diff --git a/redhat/configs/fedora/generic/CONFIG_LIBNVDIMM b/redhat/configs/fedora/generic/CONFIG_LIBNVDIMM deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/CONFIG_LIBNVDIMM +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_LIBNVDIMM is not set diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NVDIMM_DAX b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NVDIMM_DAX deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NVDIMM_DAX +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NVDIMM_DAX=y diff --git a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NVDIMM_PFN b/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NVDIMM_PFN deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/arm/aarch64/CONFIG_NVDIMM_PFN +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NVDIMM_PFN=y diff --git a/redhat/configs/fedora/generic/powerpc/CONFIG_LIBNVDIMM b/redhat/configs/fedora/generic/powerpc/CONFIG_LIBNVDIMM deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/powerpc/CONFIG_LIBNVDIMM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_LIBNVDIMM=m diff --git a/redhat/configs/fedora/generic/riscv/riscv64/CONFIG_LIBNVDIMM b/redhat/configs/fedora/generic/riscv/riscv64/CONFIG_LIBNVDIMM deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/riscv/riscv64/CONFIG_LIBNVDIMM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_LIBNVDIMM=m diff --git a/redhat/configs/fedora/generic/x86/CONFIG_LIBNVDIMM b/redhat/configs/fedora/generic/x86/CONFIG_LIBNVDIMM deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/x86/CONFIG_LIBNVDIMM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_LIBNVDIMM=m diff --git a/redhat/configs/fedora/generic/x86/CONFIG_NVDIMM_DAX b/redhat/configs/fedora/generic/x86/CONFIG_NVDIMM_DAX deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/x86/CONFIG_NVDIMM_DAX +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NVDIMM_DAX=y diff --git a/redhat/configs/fedora/generic/x86/CONFIG_NVDIMM_PFN b/redhat/configs/fedora/generic/x86/CONFIG_NVDIMM_PFN deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/fedora/generic/x86/CONFIG_NVDIMM_PFN +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NVDIMM_PFN=y diff --git a/redhat/configs/rhel/generic/CONFIG_LIBNVDIMM b/redhat/configs/rhel/generic/CONFIG_LIBNVDIMM deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_LIBNVDIMM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_LIBNVDIMM=m diff --git a/redhat/configs/rhel/generic/CONFIG_NVDIMM_DAX b/redhat/configs/rhel/generic/CONFIG_NVDIMM_DAX deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_NVDIMM_DAX +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NVDIMM_DAX=y diff --git a/redhat/configs/rhel/generic/CONFIG_NVDIMM_PFN b/redhat/configs/rhel/generic/CONFIG_NVDIMM_PFN deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_NVDIMM_PFN +++ /dev/null @@ -1 +0,0 @@ -CONFIG_NVDIMM_PFN=y diff --git a/redhat/configs/rhel/generic/powerpc/CONFIG_LIBNVDIMM b/redhat/configs/rhel/generic/powerpc/CONFIG_LIBNVDIMM deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/powerpc/CONFIG_LIBNVDIMM +++ /dev/null @@ -1 +0,0 @@ -CONFIG_LIBNVDIMM=m -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3579 -- _______________________________________________ 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