6 files changed, 26 insertions, 8 deletions
diff --git a/testing/source/k/kernel-configs/config-generic-5.4-rc6 b/testing/source/k/kernel-configs/config-generic-5.4-rc7
index 4f9125feb..c10530957 100644
--- a/testing/source/k/kernel-configs/config-generic-5.4-rc6
+++ b/testing/source/k/kernel-configs/config-generic-5.4-rc7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.0-rc6 Kernel Configuration
+# Linux/x86 5.4.0-rc7 Kernel Configuration
 #
 
 #
@@ -7118,6 +7118,7 @@ CONFIG_EXFAT_DISCARD=y
 CONFIG_EXFAT_DEFAULT_CODEPAGE=437
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_QLGE=m
+CONFIG_VBOXSF_FS=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACER_WIRELESS=m
diff --git a/testing/source/k/kernel-configs/config-generic-5.4-rc6.x64 b/testing/source/k/kernel-configs/config-generic-5.4-rc7.x64
index ddf644375..6dd8993ee 100644
--- a/testing/source/k/kernel-configs/config-generic-5.4-rc6.x64
+++ b/testing/source/k/kernel-configs/config-generic-5.4-rc7.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.0-rc6 Kernel Configuration
+# Linux/x86 5.4.0-rc7 Kernel Configuration
 #
 
 #
@@ -7068,6 +7068,7 @@ CONFIG_EXFAT_DISCARD=y
 CONFIG_EXFAT_DEFAULT_CODEPAGE=437
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_QLGE=m
+CONFIG_VBOXSF_FS=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACER_WIRELESS=m
diff --git a/testing/source/k/kernel-configs/config-generic-smp-5.4-rc6-smp b/testing/source/k/kernel-configs/config-generic-smp-5.4-rc7-smp
index e7cd8330b..b89d12332 100644
--- a/testing/source/k/kernel-configs/config-generic-smp-5.4-rc6-smp
+++ b/testing/source/k/kernel-configs/config-generic-smp-5.4-rc7-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.0-rc6 Kernel Configuration
+# Linux/x86 5.4.0-rc7 Kernel Configuration
 #
 
 #
@@ -463,6 +463,7 @@ CONFIG_MODIFY_LDT_SYSCALL=y
 # end of Processor type and features
 
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 
@@ -521,6 +522,7 @@ CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
@@ -941,7 +943,10 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_HAVE_FAST_GUP=y
 CONFIG_MEMORY_ISOLATION=y
-# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -7167,6 +7172,7 @@ CONFIG_EXFAT_DISCARD=y
 CONFIG_EXFAT_DEFAULT_CODEPAGE=437
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_QLGE=m
+CONFIG_VBOXSF_FS=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACER_WIRELESS=m
@@ -7836,6 +7842,7 @@ CONFIG_NVDIMM_KEYS=y
 CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_KMEM=m
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y
 
diff --git a/testing/source/k/kernel-configs/config-huge-5.4-rc6 b/testing/source/k/kernel-configs/config-huge-5.4-rc7
index 4aaa250c3..e64933ee1 100644
--- a/testing/source/k/kernel-configs/config-huge-5.4-rc6
+++ b/testing/source/k/kernel-configs/config-huge-5.4-rc7
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.0-rc6 Kernel Configuration
+# Linux/x86 5.4.0-rc7 Kernel Configuration
 #
 
 #
@@ -7118,6 +7118,7 @@ CONFIG_EXFAT_DISCARD=y
 CONFIG_EXFAT_DEFAULT_CODEPAGE=437
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_QLGE=m
+CONFIG_VBOXSF_FS=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACER_WIRELESS=m
diff --git a/testing/source/k/kernel-configs/config-huge-5.4-rc6.x64 b/testing/source/k/kernel-configs/config-huge-5.4-rc7.x64
index 06df84f31..130ff4284 100644
--- a/testing/source/k/kernel-configs/config-huge-5.4-rc6.x64
+++ b/testing/source/k/kernel-configs/config-huge-5.4-rc7.x64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.0-rc6 Kernel Configuration
+# Linux/x86 5.4.0-rc7 Kernel Configuration
 #
 
 #
@@ -7068,6 +7068,7 @@ CONFIG_EXFAT_DISCARD=y
 CONFIG_EXFAT_DEFAULT_CODEPAGE=437
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_QLGE=m
+CONFIG_VBOXSF_FS=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACER_WIRELESS=m
diff --git a/testing/source/k/kernel-configs/config-huge-smp-5.4-rc6-smp b/testing/source/k/kernel-configs/config-huge-smp-5.4-rc7-smp
index 819707f8d..e18d3a4ec 100644
--- a/testing/source/k/kernel-configs/config-huge-smp-5.4-rc6-smp
+++ b/testing/source/k/kernel-configs/config-huge-smp-5.4-rc7-smp
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 5.4.0-rc6 Kernel Configuration
+# Linux/x86 5.4.0-rc7 Kernel Configuration
 #
 
 #
@@ -463,6 +463,7 @@ CONFIG_MODIFY_LDT_SYSCALL=y
 # end of Processor type and features
 
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
 CONFIG_USE_PERCPU_NUMA_NODE_ID=y
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 
@@ -521,6 +522,7 @@ CONFIG_ACPI_TABLE_UPGRADE=y
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_PCI_SLOT=y
 CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
@@ -941,7 +943,10 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_HAVE_FAST_GUP=y
 CONFIG_MEMORY_ISOLATION=y
-# CONFIG_MEMORY_HOTPLUG is not set
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_MEMORY_BALLOON=y
 CONFIG_BALLOON_COMPACTION=y
@@ -7167,6 +7172,7 @@ CONFIG_EXFAT_DISCARD=y
 CONFIG_EXFAT_DEFAULT_CODEPAGE=437
 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
 CONFIG_QLGE=m
+CONFIG_VBOXSF_FS=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACER_WIRELESS=m
@@ -7836,6 +7842,7 @@ CONFIG_NVDIMM_KEYS=y
 CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_KMEM=m
 CONFIG_NVMEM=y
 CONFIG_NVMEM_SYSFS=y