kernel-5.15-0.rc5.20211012gitfa5878760579.41

* Tue Oct 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211012gitfa5878760579.41]
- Temporarily turn off selftests for bpf on ppc (Justin M. Forbes)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

28 files changed, 599 insertions, 66 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 132b64380..f4ad3f49d 100644
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 39
+RHEL_RELEASE = 41
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index d71266bdc..6376c5b2b 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -681,6 +681,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -1123,6 +1125,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
@@ -2092,6 +2095,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
@@ -2139,6 +2143,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -3400,6 +3405,7 @@ CONFIG_KALLSYMS=y
 # CONFIG_KASAN_HW_TAGS is not set
 # CONFIG_KASAN_INLINE is not set
 # CONFIG_KASAN is not set
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_SW_TAGS is not set
@@ -3465,6 +3471,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3491,7 +3498,11 @@ CONFIG_KRAITCC=m
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KUSER_HELPERS=y
 CONFIG_KVM_ARM_PMU=y
 CONFIG_KVM_XEN=y
@@ -3627,9 +3638,11 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 # CONFIG_LIQUIDIO is not set
 # CONFIG_LIQUIDIO_VF is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -4173,6 +4186,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -5399,7 +5414,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5643,6 +5657,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5801,6 +5816,7 @@ CONFIG_RESET_SCMI=y
 CONFIG_RESET_SIMPLE=y
 # CONFIG_RESET_TI_SCI is not set
 CONFIG_RESET_TI_SYSCON=m
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -5997,6 +6013,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -6579,6 +6596,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -7121,6 +7139,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -7439,6 +7459,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -7556,7 +7577,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 # CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_LKM is not set
 CONFIG_TEST_LOCKUP=m
@@ -7628,6 +7649,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 CONFIG_TINYDRM_HX8357D=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 351fe766b..e2d008fc7 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -477,6 +477,8 @@ CONFIG_BIG_KEYS=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -838,6 +840,7 @@ CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 # CONFIG_CNIC is not set
 # CONFIG_CODA_FS is not set
@@ -1633,6 +1636,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
@@ -1664,6 +1668,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -2727,6 +2732,7 @@ CONFIG_KALLSYMS=y
 CONFIG_KASAN_GENERIC=y
 # CONFIG_KASAN_HW_TAGS is not set
 CONFIG_KASAN_INLINE=y
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_SW_TAGS is not set
@@ -2783,6 +2789,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 # CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_KEYS=y
 # CONFIG_KFENCE is not set
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KGDB_HONOUR_BLOCKLIST=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2798,7 +2805,11 @@ CONFIG_KPROBE_EVENTS=y
 CONFIG_KPROBES=y
 # CONFIG_KS7010 is not set
 CONFIG_KSM=y
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD_SEV=y
 CONFIG_KVM_ARM_PMU=y
 # CONFIG_KVM_XEN is not set
@@ -2918,9 +2929,11 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 # CONFIG_LIQUIDIO is not set
 # CONFIG_LIQUIDIO_VF is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3404,6 +3417,8 @@ CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS=y
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 # CONFIG_MPU3050_I2C is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -3980,7 +3995,7 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NLS=y
 # CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=9
 CONFIG_NO_HZ_FULL=y
 # CONFIG_NO_HZ_IDLE is not set
 CONFIG_NO_HZ=y
@@ -4341,7 +4356,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -4518,6 +4532,7 @@ CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS_CEC is not set
 CONFIG_RAS=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_RC_CORE is not set
@@ -4609,6 +4624,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_QCOM_PDC is not set
 CONFIG_RESET_SCMI=y
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -4761,6 +4777,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5272,6 +5289,7 @@ CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 # CONFIG_SMARTJOYPLUS_FF is not set
@@ -5796,6 +5814,8 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -6025,6 +6045,7 @@ CONFIG_SYNCLINKMP=m
 CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6123,7 +6144,7 @@ CONFIG_TEST_FPU=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 # CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_LOCKUP is not set
@@ -6190,6 +6211,7 @@ CONFIG_THUNDERX2_PMU=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 21cc2bcf9..9bc160020 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -681,6 +681,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -1123,6 +1125,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
@@ -2084,6 +2087,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
@@ -2125,6 +2129,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -3443,6 +3448,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3469,7 +3475,11 @@ CONFIG_KRAITCC=m
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KUSER_HELPERS=y
 CONFIG_KVM_ARM_PMU=y
 CONFIG_KVM_XEN=y
@@ -3605,9 +3615,11 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 # CONFIG_LIQUIDIO is not set
 # CONFIG_LIQUIDIO_VF is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -4150,6 +4162,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -5376,7 +5390,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5620,6 +5633,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5778,6 +5792,7 @@ CONFIG_RESET_SCMI=y
 CONFIG_RESET_SIMPLE=y
 # CONFIG_RESET_TI_SCI is not set
 CONFIG_RESET_TI_SYSCON=m
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -5974,6 +5989,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -6556,6 +6572,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -7096,6 +7113,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -7414,6 +7433,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -7603,6 +7623,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 CONFIG_TINYDRM_HX8357D=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index e381e25bd..7fcbeba30 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -477,6 +477,8 @@ CONFIG_BIG_KEYS=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -838,6 +840,7 @@ CONFIG_CMDLINE="console=ttyAMA0"
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 # CONFIG_CNIC is not set
 # CONFIG_CODA_FS is not set
@@ -1625,6 +1628,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
@@ -1650,6 +1654,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -2763,6 +2768,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 # CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_KEYS=y
 # CONFIG_KFENCE is not set
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KGDB_HONOUR_BLOCKLIST=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2778,7 +2784,11 @@ CONFIG_KPROBE_EVENTS=y
 CONFIG_KPROBES=y
 # CONFIG_KS7010 is not set
 CONFIG_KSM=y
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD_SEV=y
 CONFIG_KVM_ARM_PMU=y
 # CONFIG_KVM_XEN is not set
@@ -2898,9 +2908,11 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 # CONFIG_LIQUIDIO is not set
 # CONFIG_LIQUIDIO_VF is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3384,6 +3396,8 @@ CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS=y
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 # CONFIG_MPU3050_I2C is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -3960,7 +3974,7 @@ CONFIG_NLS_MAC_TURKISH=m
 CONFIG_NLS_UTF8=m
 CONFIG_NLS=y
 # CONFIG_NOA1305 is not set
-CONFIG_NODES_SHIFT=6
+CONFIG_NODES_SHIFT=9
 CONFIG_NO_HZ_FULL=y
 # CONFIG_NO_HZ_IDLE is not set
 CONFIG_NO_HZ=y
@@ -4320,7 +4334,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -4497,6 +4510,7 @@ CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS_CEC is not set
 CONFIG_RAS=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_RC_CORE is not set
@@ -4588,6 +4602,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_QCOM_PDC is not set
 CONFIG_RESET_SCMI=y
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -4740,6 +4755,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5251,6 +5267,7 @@ CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 # CONFIG_SMARTJOYPLUS_FF is not set
@@ -5773,6 +5790,8 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -6002,6 +6021,7 @@ CONFIG_SYNCLINKMP=m
 CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6167,6 +6187,7 @@ CONFIG_THUNDERX2_PMU=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index c12efee4b..41f3a6dd8 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -702,6 +702,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -1144,6 +1146,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
@@ -2124,6 +2127,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
@@ -2180,6 +2184,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -3432,6 +3437,7 @@ CONFIG_KALLSYMS=y
 # CONFIG_KASAN_HW_TAGS is not set
 # CONFIG_KASAN_INLINE is not set
 # CONFIG_KASAN is not set
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_VMALLOC is not set
@@ -3501,6 +3507,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 # CONFIG_KEYSTONE_REMOTEPROC is not set
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3527,7 +3534,11 @@ CONFIG_KS8851=m
 CONFIG_KS8851_MLL=m
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KUSER_HELPERS=y
 CONFIG_KVM_XEN=y
 CONFIG_KXCJK1013=m
@@ -3668,7 +3679,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -4244,6 +4257,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -5501,7 +5516,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5738,6 +5752,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5915,6 +5930,7 @@ CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_STM32MP157=y
 # CONFIG_RESET_TI_SCI is not set
 CONFIG_RESET_TI_SYSCON=m
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -6126,6 +6142,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -6719,6 +6736,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -7280,6 +7298,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 CONFIG_SND_SOC_TLV320AIC3X=m
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -7646,6 +7666,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -7759,7 +7780,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 # CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_LKM is not set
 CONFIG_TEST_LOCKUP=m
@@ -7839,6 +7860,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 CONFIG_TINYDRM_HX8357D=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index c984b2711..36b7f5c84 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -702,6 +702,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -1144,6 +1146,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
@@ -2117,6 +2120,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
@@ -2167,6 +2171,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -3480,6 +3485,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 # CONFIG_KEYSTONE_REMOTEPROC is not set
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3506,7 +3512,11 @@ CONFIG_KS8851=m
 CONFIG_KS8851_MLL=m
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KUSER_HELPERS=y
 CONFIG_KVM_XEN=y
 CONFIG_KXCJK1013=m
@@ -3647,7 +3657,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -4222,6 +4234,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -5479,7 +5493,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5716,6 +5729,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5893,6 +5907,7 @@ CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_STM32MP157=y
 # CONFIG_RESET_TI_SCI is not set
 CONFIG_RESET_TI_SYSCON=m
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -6104,6 +6119,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -6697,6 +6713,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -7256,6 +7273,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 CONFIG_SND_SOC_TLV320AIC3X=m
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -7622,6 +7641,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -7815,6 +7835,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 CONFIG_TINYDRM_HX8357D=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index e2814909c..8df0bd2a5 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -680,6 +680,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -1117,6 +1119,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
@@ -2076,6 +2079,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
@@ -2132,6 +2136,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -3364,6 +3369,7 @@ CONFIG_KALLSYMS=y
 # CONFIG_KASAN_HW_TAGS is not set
 # CONFIG_KASAN_INLINE is not set
 # CONFIG_KASAN is not set
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_VMALLOC is not set
@@ -3430,6 +3436,7 @@ CONFIG_KEYSTONE_IRQ=m
 # CONFIG_KEYSTONE_REMOTEPROC is not set
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3456,7 +3463,11 @@ CONFIG_KS8851=m
 CONFIG_KS8851_MLL=m
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KUSER_HELPERS=y
 CONFIG_KVM_XEN=y
 CONFIG_KVM=y
@@ -3594,7 +3605,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -4152,6 +4165,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -5367,7 +5382,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5579,6 +5593,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5739,6 +5754,7 @@ CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_STM32MP157=y
 # CONFIG_RESET_TI_SCI is not set
 CONFIG_RESET_TI_SYSCON=m
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -5941,6 +5957,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -6523,6 +6540,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -7068,6 +7086,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -7405,6 +7425,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -7518,7 +7539,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 # CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_LKM is not set
 CONFIG_TEST_LOCKUP=m
@@ -7599,6 +7620,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 CONFIG_TI_MESSAGE_MANAGER=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 1e5166c67..fe27d5b1a 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -680,6 +680,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -1117,6 +1119,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_EXTEND is not set
 # CONFIG_CMDLINE_FORCE is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
@@ -2069,6 +2072,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXTCON_ADC_JACK=m
 CONFIG_EXTCON_AXP288=m
@@ -2119,6 +2123,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -3409,6 +3414,7 @@ CONFIG_KEYSTONE_IRQ=m
 # CONFIG_KEYSTONE_REMOTEPROC is not set
 CONFIG_KEYSTONE_USB_PHY=m
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3435,7 +3441,11 @@ CONFIG_KS8851=m
 CONFIG_KS8851_MLL=m
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KUSER_HELPERS=y
 CONFIG_KVM_XEN=y
 CONFIG_KVM=y
@@ -3573,7 +3583,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -4130,6 +4142,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -5345,7 +5359,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5557,6 +5570,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5717,6 +5731,7 @@ CONFIG_RESET_SIMPLE=y
 CONFIG_RESET_STM32MP157=y
 # CONFIG_RESET_TI_SCI is not set
 CONFIG_RESET_TI_SYSCON=m
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -5919,6 +5934,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -6501,6 +6517,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -7044,6 +7061,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -7381,6 +7400,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 CONFIG_SYNTH_EVENTS=y
 CONFIG_SYSCON_REBOOT_MODE=y
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -7575,6 +7595,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 CONFIG_TI_MESSAGE_MANAGER=m
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 9863796b0..3236b1ea7 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -517,6 +517,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -919,6 +921,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 CONFIG_CODA_FS=m
@@ -1768,6 +1771,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_FSA9480 is not set
@@ -1816,6 +1820,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -3052,6 +3057,7 @@ CONFIG_KALLSYMS=y
 # CONFIG_KASAN_GENERIC is not set
 # CONFIG_KASAN_INLINE is not set
 # CONFIG_KASAN is not set
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_VMALLOC is not set
@@ -3110,6 +3116,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3137,7 +3144,11 @@ CONFIG_KS0108_PORT=0x378
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD=m
 # CONFIG_KVM_DEBUG_FS is not set
 CONFIG_KVM_GUEST=y
@@ -3277,7 +3288,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3797,6 +3810,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4894,7 +4909,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5073,6 +5087,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 # CONFIG_RAS_CEC_DEBUG is not set
 CONFIG_RAS_CEC=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5195,6 +5210,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5355,6 +5371,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5910,6 +5927,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -6443,6 +6461,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6704,6 +6724,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6800,7 +6821,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 # CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_LKM is not set
 CONFIG_TEST_LOCKUP=m
@@ -6874,6 +6895,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 339820759..e620fb1d8 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -516,6 +516,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -918,6 +920,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 CONFIG_CODA_FS=m
@@ -1759,6 +1762,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_FSA9480 is not set
@@ -1801,6 +1805,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -3088,6 +3093,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3115,7 +3121,11 @@ CONFIG_KS0108_PORT=0x378
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD=m
 # CONFIG_KVM_DEBUG_FS is not set
 CONFIG_KVM_GUEST=y
@@ -3255,7 +3265,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3775,6 +3787,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4872,7 +4886,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5051,6 +5064,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 # CONFIG_RAS_CEC_DEBUG is not set
 CONFIG_RAS_CEC=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5173,6 +5187,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5333,6 +5348,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5888,6 +5904,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -6419,6 +6436,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6680,6 +6699,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6850,6 +6870,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 1f86eb112..2125dad97 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -476,6 +476,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -868,6 +870,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMM=y
 CONFIG_CNIC=m
@@ -1649,6 +1652,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_FSA9480 is not set
@@ -1697,6 +1701,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -2830,6 +2835,7 @@ CONFIG_KALLSYMS=y
 # CONFIG_KASAN_GENERIC is not set
 # CONFIG_KASAN_INLINE is not set
 # CONFIG_KASAN is not set
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_VMALLOC is not set
@@ -2886,6 +2892,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -2910,7 +2917,11 @@ CONFIG_KPROBES=y
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_BOOK3S_64_HV=m
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_PR=m
@@ -3048,7 +3059,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3541,6 +3554,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4769,6 +4784,7 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -4889,6 +4905,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -5051,6 +5068,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5593,6 +5611,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -6125,6 +6144,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6376,6 +6397,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6471,7 +6493,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 # CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_LKM is not set
 CONFIG_TEST_LOCKUP=m
@@ -6538,6 +6560,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 0baec6799..04d9f9fc5 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -360,6 +360,8 @@ CONFIG_BIG_KEYS=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -709,6 +711,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMM=y
 CONFIG_CNIC=m
@@ -1469,6 +1472,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON is not set
@@ -1502,6 +1506,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -2553,6 +2558,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KASAN is not set
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 CONFIG_KASAN_VMALLOC=y
@@ -2607,6 +2613,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 # CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_KEYS=y
 # CONFIG_KFENCE is not set
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KGDB_HONOUR_BLOCKLIST=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2623,7 +2630,11 @@ CONFIG_KPROBES_ON_FTRACE=y
 CONFIG_KPROBES=y
 # CONFIG_KS7010 is not set
 CONFIG_KSM=y
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD_SEV=y
 CONFIG_KVM_BOOK3S_64_HV=m
 CONFIG_KVM_BOOK3S_64=m
@@ -2748,7 +2759,9 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3225,6 +3238,8 @@ CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS=y
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 # CONFIG_MPU3050_I2C is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4308,6 +4323,7 @@ CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS_CEC is not set
 CONFIG_RAS=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_RC_CORE is not set
@@ -4397,6 +4413,7 @@ CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_QCOM_PDC is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -4546,6 +4563,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5056,6 +5074,7 @@ CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 # CONFIG_SMARTJOYPLUS_FF is not set
@@ -5577,6 +5596,8 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -5791,6 +5812,7 @@ CONFIG_SYNCLINKMP=m
 CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -5883,7 +5905,7 @@ CONFIG_TEST_FPU=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 CONFIG_TEST_LIVEPATCH=m
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_LOCKUP is not set
@@ -5946,6 +5968,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 4cda20343..a7a0f15ca 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -475,6 +475,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -867,6 +869,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMM=y
 CONFIG_CNIC=m
@@ -1640,6 +1643,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_FSA9480 is not set
@@ -1682,6 +1686,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -2864,6 +2869,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -2888,7 +2894,11 @@ CONFIG_KPROBES=y
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_BOOK3S_64_HV=m
 CONFIG_KVM_BOOK3S_64=m
 CONFIG_KVM_BOOK3S_64_PR=m
@@ -3026,7 +3036,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3518,6 +3530,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4746,6 +4760,7 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -4866,6 +4881,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -5028,6 +5044,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5570,6 +5587,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -6100,6 +6118,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6351,6 +6371,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6513,6 +6534,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index b4649c652..b8677fded 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -360,6 +360,8 @@ CONFIG_BIG_KEYS=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -709,6 +711,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMM=y
 CONFIG_CNIC=m
@@ -1461,6 +1464,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON is not set
@@ -1488,6 +1492,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -2590,6 +2595,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 # CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_KEYS=y
 # CONFIG_KFENCE is not set
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KGDB_HONOUR_BLOCKLIST=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2606,7 +2612,11 @@ CONFIG_KPROBES_ON_FTRACE=y
 CONFIG_KPROBES=y
 # CONFIG_KS7010 is not set
 CONFIG_KSM=y
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD_SEV=y
 CONFIG_KVM_BOOK3S_64_HV=m
 CONFIG_KVM_BOOK3S_64=m
@@ -2731,7 +2741,9 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3208,6 +3220,8 @@ CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS=y
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 # CONFIG_MPU3050_I2C is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4291,6 +4305,7 @@ CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS_CEC is not set
 CONFIG_RAS=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_RC_CORE is not set
@@ -4380,6 +4395,7 @@ CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_QCOM_PDC is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -4529,6 +4545,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5039,6 +5056,7 @@ CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 # CONFIG_SMARTJOYPLUS_FF is not set
@@ -5558,6 +5576,8 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -5772,6 +5792,7 @@ CONFIG_SYNCLINKMP=m
 CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -5927,6 +5948,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index ced9be650..84bb1fb98 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -480,6 +480,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -875,6 +877,7 @@ CONFIG_CMA=y
 CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMM_IUCV=y
 CONFIG_CMM=m
@@ -1662,6 +1665,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_FSA9480 is not set
@@ -1707,6 +1711,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -2808,6 +2813,7 @@ CONFIG_KALLSYMS=y
 # CONFIG_KASAN_GENERIC is not set
 # CONFIG_KASAN_INLINE is not set
 # CONFIG_KASAN is not set
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_VMALLOC is not set
@@ -2866,6 +2872,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -2890,7 +2897,11 @@ CONFIG_KPROBES=y
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM=m
 # CONFIG_KVM_S390_UCONTROL is not set
 CONFIG_KVM_XEN=y
@@ -3024,7 +3035,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3524,6 +3537,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4537,7 +4552,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -4711,6 +4725,7 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -4832,6 +4847,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -4990,6 +5006,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 # CONFIG_RTC_NVMEM is not set
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5544,6 +5561,7 @@ CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -6078,6 +6096,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6323,6 +6343,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6419,7 +6440,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 # CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_LKM is not set
 CONFIG_TEST_LOCKUP=m
@@ -6486,6 +6507,7 @@ CONFIG_TIFM_7XX1=m
 # CONFIG_TIFM_CORE is not set
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 53a28ff53..f36ce220f 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -360,6 +360,8 @@ CONFIG_BIG_KEYS=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -712,6 +714,7 @@ CONFIG_CMA_SYSFS=y
 CONFIG_CMA=y
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMM_IUCV=y
 CONFIG_CMM=m
@@ -1477,6 +1480,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON is not set
@@ -1507,6 +1511,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -2533,6 +2538,7 @@ CONFIG_KALLSYMS_BASE_RELATIVE=y
 CONFIG_KALLSYMS=y
 # CONFIG_KARMA_PARTITION is not set
 # CONFIG_KASAN is not set
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 CONFIG_KASAN_VMALLOC=y
@@ -2590,6 +2596,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 # CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_KEYS=y
 # CONFIG_KFENCE is not set
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KGDB_HONOUR_BLOCKLIST=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2605,7 +2612,11 @@ CONFIG_KPROBE_EVENTS=y
 CONFIG_KPROBES=y
 # CONFIG_KS7010 is not set
 CONFIG_KSM=y
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD_SEV=y
 CONFIG_KVM=m
 # CONFIG_KVM_S390_UCONTROL is not set
@@ -2725,7 +2736,9 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3207,6 +3220,8 @@ CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS=y
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 # CONFIG_MPU3050_I2C is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4078,7 +4093,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -4249,6 +4263,7 @@ CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS_CEC is not set
 # CONFIG_RAS is not set
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_RC_CORE is not set
@@ -4337,6 +4352,7 @@ CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_QCOM_PDC is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -4482,6 +4498,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 # CONFIG_RTC_NVMEM is not set
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5001,6 +5018,7 @@ CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 # CONFIG_SMARTJOYPLUS_FF is not set
@@ -5525,6 +5543,8 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -5738,6 +5758,7 @@ CONFIG_SYNCLINK=m
 CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -5829,7 +5850,7 @@ CONFIG_TEST_FPU=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 # CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_LOCKUP is not set
@@ -5892,6 +5913,7 @@ CONFIG_THUNDERX2_PMU=m
 # CONFIG_TIFM_CORE is not set
 CONFIG_TIGON3_HWMON=y
 # CONFIG_TIGON3 is not set
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 95b18faea..8fcea456d 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -479,6 +479,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -874,6 +876,7 @@ CONFIG_CMA=y
 CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMM_IUCV=y
 CONFIG_CMM=m
@@ -1653,6 +1656,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
 # CONFIG_EXTCON_FSA9480 is not set
@@ -1692,6 +1696,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -2844,6 +2849,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -2868,7 +2874,11 @@ CONFIG_KPROBES=y
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM=m
 # CONFIG_KVM_S390_UCONTROL is not set
 CONFIG_KVM_XEN=y
@@ -3002,7 +3012,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3501,6 +3513,8 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4514,7 +4528,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -4688,6 +4701,7 @@ CONFIG_RAPIDIO_RXS_GEN3=m
 CONFIG_RAPIDIO_TSI568=m
 CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -4809,6 +4823,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
 CONFIG_RFKILL_GPIO=m
@@ -4967,6 +4982,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 # CONFIG_RTC_NVMEM is not set
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5521,6 +5537,7 @@ CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -6053,6 +6070,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6298,6 +6317,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6461,6 +6481,7 @@ CONFIG_TIFM_7XX1=m
 # CONFIG_TIFM_CORE is not set
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index d80cfe11a..cecc88693 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -360,6 +360,8 @@ CONFIG_BIG_KEYS=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -712,6 +714,7 @@ CONFIG_CMA_SYSFS=y
 CONFIG_CMA=y
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CMM_IUCV=y
 CONFIG_CMM=m
@@ -1469,6 +1472,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON is not set
@@ -1493,6 +1497,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -2573,6 +2578,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 # CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_KEYS=y
 # CONFIG_KFENCE is not set
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KGDB_HONOUR_BLOCKLIST=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2588,7 +2594,11 @@ CONFIG_KPROBE_EVENTS=y
 CONFIG_KPROBES=y
 # CONFIG_KS7010 is not set
 CONFIG_KSM=y
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD_SEV=y
 CONFIG_KVM=m
 # CONFIG_KVM_S390_UCONTROL is not set
@@ -2708,7 +2718,9 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3190,6 +3202,8 @@ CONFIG_MPLS_ROUTING=m
 CONFIG_MPLS=y
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 # CONFIG_MPU3050_I2C is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4061,7 +4075,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -4232,6 +4245,7 @@ CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS_CEC is not set
 # CONFIG_RAS is not set
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_RC_CORE is not set
@@ -4320,6 +4334,7 @@ CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_QCOM_PDC is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -4465,6 +4480,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 # CONFIG_RTC_NVMEM is not set
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -4984,6 +5000,7 @@ CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 # CONFIG_SMARTJOYPLUS_FF is not set
@@ -5506,6 +5523,8 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -5719,6 +5738,7 @@ CONFIG_SYNCLINK=m
 CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -5873,6 +5893,7 @@ CONFIG_THUNDERX2_PMU=m
 # CONFIG_TIFM_CORE is not set
 CONFIG_TIGON3_HWMON=y
 # CONFIG_TIGON3 is not set
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 3238698b5..4efed297f 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -364,6 +364,8 @@ CONFIG_BIG_KEYS=y
 CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_MISC is not set
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -717,6 +719,7 @@ CONFIG_CMA_AREAS=7
 CONFIG_CMA_SYSFS=y
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 # CONFIG_CMM is not set
 CONFIG_CMM_IUCV=y
@@ -1479,6 +1482,7 @@ CONFIG_EXPORTFS=y
 # CONFIG_EXT4_FS is not set
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON is not set
@@ -1503,6 +1507,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -2591,6 +2596,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 # CONFIG_KEYS is not set
 # CONFIG_KEYS_REQUEST_CACHE is not set
 # CONFIG_KFENCE is not set
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KGDB_HONOUR_BLOCKLIST=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2606,7 +2612,11 @@ CONFIG_KPROBE_EVENTS=y
 CONFIG_KPROBES=y
 # CONFIG_KS7010 is not set
 # CONFIG_KSM is not set
+# CONFIG_KUNIT_ALL_TESTS is not set
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
 # CONFIG_KUNIT is not set
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD_SEV=y
 # CONFIG_KVM is not set
 # CONFIG_KVM_S390_UCONTROL is not set
@@ -2726,7 +2736,9 @@ CONFIG_LIBFCOE=y
 CONFIG_LIBFC=y
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3210,6 +3222,8 @@ CONFIG_MOUSE_SYNAPTICS_USB=m
 CONFIG_MPLS=y
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 # CONFIG_MPU3050_I2C is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4083,7 +4097,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -4255,6 +4268,7 @@ CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS_CEC is not set
 # CONFIG_RAS is not set
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_RC_CORE is not set
@@ -4343,6 +4357,7 @@ CONFIG_RENESAS_PHY=m
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_QCOM_PDC is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -4488,6 +4503,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 # CONFIG_RTC_NVMEM is not set
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5012,6 +5028,7 @@ CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 # CONFIG_SMARTJOYPLUS_FF is not set
@@ -5534,6 +5551,8 @@ CONFIG_SND_SOC_SOF_TOPLEVEL=y
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SOC_TS3A227E is not set
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -5750,6 +5769,7 @@ CONFIG_SYNCLINK=m
 CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -5906,6 +5926,7 @@ CONFIG_THUNDERX2_PMU=m
 # CONFIG_TIFM_CORE is not set
 CONFIG_TIGON3_HWMON=y
 # CONFIG_TIGON3 is not set
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index a974f026b..aec68cf25 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -524,6 +524,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -933,6 +935,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 CONFIG_CODA_FS=m
@@ -1811,6 +1814,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
 CONFIG_EXTCON_AXP288=m
@@ -1862,6 +1866,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -3107,6 +3112,7 @@ CONFIG_KALLSYMS=y
 # CONFIG_KASAN_GENERIC is not set
 # CONFIG_KASAN_INLINE is not set
 # CONFIG_KASAN is not set
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 # CONFIG_KASAN_VMALLOC is not set
@@ -3167,6 +3173,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3194,7 +3201,11 @@ CONFIG_KS0108_PORT=0x378
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_AMD_SEV=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -3335,7 +3346,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3844,6 +3857,8 @@ CONFIG_MPLS_ROUTING=m
 # CONFIG_MPSC is not set
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4937,7 +4952,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5118,6 +5132,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 # CONFIG_RAS_CEC_DEBUG is not set
 CONFIG_RAS_CEC=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5241,6 +5256,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5402,6 +5418,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5962,6 +5979,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -6495,6 +6513,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6760,6 +6780,7 @@ CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6855,7 +6876,7 @@ CONFIG_TERANETICS_PHY=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 # CONFIG_TEST_LIVEPATCH is not set
 # CONFIG_TEST_LKM is not set
 CONFIG_TEST_LOCKUP=m
@@ -6929,6 +6950,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index c65cc845c..99ab98971 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -388,6 +388,8 @@ CONFIG_BIG_KEYS=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -741,6 +743,7 @@ CONFIG_CMA=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
@@ -1583,6 +1586,7 @@ CONFIG_EXT4_DEBUG=y
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON is not set
@@ -1614,6 +1618,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
@@ -2725,6 +2730,7 @@ CONFIG_KALLSYMS=y
 # CONFIG_KARMA_PARTITION is not set
 CONFIG_KASAN_GENERIC=y
 CONFIG_KASAN_INLINE=y
+CONFIG_KASAN_KUNIT_TEST=m
 # CONFIG_KASAN_MODULE_TEST is not set
 # CONFIG_KASAN_OUTLINE is not set
 CONFIG_KASAN_VMALLOC=y
@@ -2783,6 +2789,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 # CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_KEYS=y
 # CONFIG_KFENCE is not set
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KGDB_HONOUR_BLOCKLIST=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2798,7 +2805,11 @@ CONFIG_KPROBE_EVENTS=y
 CONFIG_KPROBES=y
 # CONFIG_KS7010 is not set
 CONFIG_KSM=y
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_AMD_SEV=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -2921,7 +2932,9 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3407,6 +3420,8 @@ CONFIG_MPLS=y
 # CONFIG_MPSC is not set
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 # CONFIG_MPU3050_I2C is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4316,7 +4331,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -4486,6 +4500,7 @@ CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS_CEC is not set
 CONFIG_RAS=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_RC_CORE is not set
@@ -4574,6 +4589,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_QCOM_PDC is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -4720,6 +4736,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5230,6 +5247,7 @@ CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 # CONFIG_SMARTJOYPLUS_FF is not set
@@ -5752,6 +5770,8 @@ CONFIG_SND_SOC_SSM4567=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -5982,6 +6002,7 @@ CONFIG_SYNCLINKMP=m
 CONFIG_SYN_COOKIES=y
 CONFIG_SYNTH_EVENT_GEN_TEST=m
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6072,7 +6093,7 @@ CONFIG_TEST_FPU=m
 # CONFIG_TEST_KASAN_MODULE is not set
 # CONFIG_TEST_KMOD is not set
 CONFIG_TEST_KSTRTOX=y
-CONFIG_TEST_LIST_SORT=y
+CONFIG_TEST_LIST_SORT=m
 CONFIG_TEST_LIVEPATCH=m
 # CONFIG_TEST_LKM is not set
 # CONFIG_TEST_LOCKUP is not set
@@ -6142,6 +6163,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 7e4a6f5fa..e6738381b 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -523,6 +523,8 @@ CONFIG_BINFMT_ELF=y
 # CONFIG_BINFMT_FLAT is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 CONFIG_BLK_CGROUP_IOCOST=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -932,6 +934,7 @@ CONFIG_CMDLINE=""
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 CONFIG_CODA_FS=m
@@ -1802,6 +1805,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_FS=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_ADC_JACK is not set
 CONFIG_EXTCON_AXP288=m
@@ -1847,6 +1851,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -3145,6 +3150,7 @@ CONFIG_KEY_DH_OPERATIONS=y
 CONFIG_KEY_NOTIFICATIONS=y
 CONFIG_KEYS_REQUEST_CACHE=y
 CONFIG_KEYS=y
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KFENCE_NUM_OBJECTS=255
 CONFIG_KFENCE_SAMPLE_INTERVAL=0
 CONFIG_KFENCE_STATIC_KEYS=y
@@ -3172,7 +3178,11 @@ CONFIG_KS0108_PORT=0x378
 # CONFIG_KS8851_MLL is not set
 CONFIG_KSM=y
 CONFIG_KSZ884X_PCI=m
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_AMD_SEV=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -3313,7 +3323,9 @@ CONFIG_LIBFCOE=m
 # CONFIG_LIBIPW_DEBUG is not set
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3822,6 +3834,8 @@ CONFIG_MPLS_ROUTING=m
 # CONFIG_MPSC is not set
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4915,7 +4929,6 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 # CONFIG_PPC_PTDUMP is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -5096,6 +5109,7 @@ CONFIG_RAPIDIO_TSI57X=m
 CONFIG_RAPIDIO_TSI721=m
 # CONFIG_RAS_CEC_DEBUG is not set
 CONFIG_RAS_CEC=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RAVE_SP_CORE is not set
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
@@ -5219,6 +5233,7 @@ CONFIG_REMOTEPROC=y
 # CONFIG_RESET_INTEL_GW is not set
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -5380,6 +5395,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5940,6 +5956,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 CONFIG_SMARTJOYPLUS_FF=y
@@ -6471,6 +6488,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SOC_TS3A227E=m
 CONFIG_SND_SOC_TSCS42XX=m
@@ -6736,6 +6755,7 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 CONFIG_SYNTH_EVENTS=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6905,6 +6925,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 38624afcb..50ba7714a 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -388,6 +388,8 @@ CONFIG_BIG_KEYS=y
 CONFIG_BINFMT_ELF=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BITFIELD_KUNIT is not set
+# CONFIG_BITS_TEST is not set
 CONFIG_BLK_CGROUP_FC_APPID=y
 # CONFIG_BLK_CGROUP_IOCOST is not set
 CONFIG_BLK_CGROUP_IOLATENCY=y
@@ -741,6 +743,7 @@ CONFIG_CMA=y
 # CONFIG_CMDLINE_BOOL is not set
 # CONFIG_CMDLINE_EXTEND is not set
 CONFIG_CMDLINE_FROM_BOOTLOADER=y
+# CONFIG_CMDLINE_KUNIT_TEST is not set
 # CONFIG_CMDLINE_PARTITION is not set
 CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
@@ -1575,6 +1578,7 @@ CONFIG_EXPORTFS=y
 CONFIG_EXT4_FS=m
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_KUNIT_TESTS=m
 CONFIG_EXT4_USE_FOR_EXT2=y
 # CONFIG_EXTCON_FSA9480 is not set
 # CONFIG_EXTCON is not set
@@ -1600,6 +1604,7 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437
 CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
 # CONFIG_FAT_DEFAULT_UTF8 is not set
 CONFIG_FAT_FS=m
+CONFIG_FAT_KUNIT_TEST=m
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FAULT_INJECTION_USERCOPY is not set
 # CONFIG_FB_3DFX is not set
@@ -2764,6 +2769,7 @@ CONFIG_KEY_NOTIFICATIONS=y
 # CONFIG_KEYS_REQUEST_CACHE is not set
 CONFIG_KEYS=y
 # CONFIG_KFENCE is not set
+CONFIG_KFENCE_KUNIT_TEST=m
 CONFIG_KGDB_HONOUR_BLOCKLIST=y
 CONFIG_KGDB_KDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2779,7 +2785,11 @@ CONFIG_KPROBE_EVENTS=y
 CONFIG_KPROBES=y
 # CONFIG_KS7010 is not set
 CONFIG_KSM=y
-# CONFIG_KUNIT is not set
+CONFIG_KUNIT_ALL_TESTS=m
+CONFIG_KUNIT_DEBUGFS=y
+CONFIG_KUNIT_EXAMPLE_TEST=m
+CONFIG_KUNIT=m
+CONFIG_KUNIT_TEST=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_AMD_SEV=y
 # CONFIG_KVM_DEBUG_FS is not set
@@ -2902,7 +2912,9 @@ CONFIG_LIBFC=m
 CONFIG_LIBFCOE=m
 CONFIG_LIBNVDIMM=m
 # CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_LINEAR_RANGES_TEST is not set
 CONFIG_LIRC=y
+CONFIG_LIST_KUNIT_TEST=m
 # CONFIG_LITEX_LITEETH is not set
 # CONFIG_LITEX_SOC_CONTROLLER is not set
 CONFIG_LIVEPATCH=y
@@ -3388,6 +3400,8 @@ CONFIG_MPLS=y
 # CONFIG_MPSC is not set
 # CONFIG_MPTCP_HMAC_TEST is not set
 CONFIG_MPTCP_IPV6=y
+CONFIG_MPTCP_KUNIT_TEST=m
+CONFIG_MPTCP_KUNIT_TESTS=m
 CONFIG_MPTCP=y
 # CONFIG_MPU3050_I2C is not set
 CONFIG_MQ_IOSCHED_DEADLINE=y
@@ -4296,7 +4310,6 @@ CONFIG_POWER_SUPPLY_HWMON=y
 CONFIG_POWER_SUPPLY=y
 # CONFIG_PPC_PROT_SAO_LPAR is not set
 CONFIG_PPC_QUEUED_SPINLOCKS=y
-# CONFIG_PPC_RFI_SRR_DEBUG is not set
 CONFIG_PPC_RTAS_FILTER=y
 CONFIG_PPDEV=m
 CONFIG_PPP_ASYNC=m
@@ -4466,6 +4479,7 @@ CONFIG_RANDOM_TRUST_CPU=y
 # CONFIG_RAPIDIO is not set
 # CONFIG_RAS_CEC is not set
 CONFIG_RAS=y
+CONFIG_RATIONAL_KUNIT_TEST=m
 # CONFIG_RBTREE_TEST is not set
 CONFIG_RC_ATI_REMOTE=m
 # CONFIG_RC_CORE is not set
@@ -4554,6 +4568,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_MCHP_SPARX5 is not set
 # CONFIG_RESET_QCOM_PDC is not set
 # CONFIG_RESET_TI_SYSCON is not set
+# CONFIG_RESOURCE_KUNIT_TEST is not set
 CONFIG_RETPOLINE=y
 # CONFIG_RFD77402 is not set
 # CONFIG_RFD_FTL is not set
@@ -4700,6 +4715,7 @@ CONFIG_RTC_HCTOSYS=y
 CONFIG_RTC_INTF_DEV=y
 CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_LIB_KUNIT_TEST=m
 CONFIG_RTC_NVMEM=y
 CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
 CONFIG_RTC_SYSTOHC=y
@@ -5210,6 +5226,7 @@ CONFIG_SLIP_SMART=y
 CONFIG_SLUB_CPU_PARTIAL=y
 # CONFIG_SLUB_DEBUG_ON is not set
 CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_KUNIT_TEST=m
 # CONFIG_SLUB_STATS is not set
 CONFIG_SLUB=y
 # CONFIG_SMARTJOYPLUS_FF is not set
@@ -5730,6 +5747,8 @@ CONFIG_SND_SOC_SSM4567=m
 # CONFIG_SND_SOC_TLV320AIC3X_I2C is not set
 # CONFIG_SND_SOC_TLV320AIC3X is not set
 # CONFIG_SND_SOC_TLV320AIC3X_SPI is not set
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TEST=m
+CONFIG_SND_SOC_TOPOLOGY_KUNIT_TESTS=m
 # CONFIG_SND_SOC_TPA6130A2 is not set
 CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_TSCS42XX is not set
@@ -5960,6 +5979,7 @@ CONFIG_SYNCLINKMP=m
 CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENT_GEN_TEST is not set
 # CONFIG_SYSCON_REBOOT_MODE is not set
+CONFIG_SYSCTL_KUNIT_TEST=m
 CONFIG_SYSCTL=y
 # CONFIG_SYSFB_SIMPLEFB is not set
 # CONFIG_SYSFS_DEPRECATED is not set
@@ -6120,6 +6140,7 @@ CONFIG_TIFM_7XX1=m
 CONFIG_TIFM_CORE=m
 CONFIG_TIGON3_HWMON=y
 CONFIG_TIGON3=m
+CONFIG_TIME_KUNIT_TEST=m
 CONFIG_TIME_NS=y
 CONFIG_TIMERLAT_TRACER=y
 # CONFIG_TINYDRM_HX8357D is not set
diff --git a/kernel.spec b/kernel.spec
index 83fa31971..1f880a2a0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -83,9 +83,9 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
-%global distro_build 0.rc5.39
+%global distro_build 0.rc5.20211012gitfa5878760579.41
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -130,13 +130,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.15.0
 %define patchversion 5.15
-%define pkgrelease 0.rc5.39
+%define pkgrelease 0.rc5.20211012gitfa5878760579.41
 
 # This is needed to do merge window version magic
 %define patchlevel 15
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.39%{?buildid}%{?dist}
+%define specrelease 0.rc5.20211012gitfa5878760579.41%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -432,8 +432,9 @@ Summary: The Linux kernel
 %define make_target vmlinux
 %define kernel_image vmlinux
 %define kernel_image_elf 1
-%define with_selftests 0
 %define use_vdso 0
+# Currently very broken for ppc
+%define with_selftests 0
 %define all_arch_configs kernel-%{version}-ppc64le*.config
 %endif
 
@@ -678,7 +679,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15-rc5.tar.xz
+Source0: linux-5.15-rc5-25-gfa5878760579.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1369,8 +1370,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.15-rc5 -c
-mv linux-5.15-rc5 linux-%{KVERREL}
+%setup -q -n kernel-5.15-rc5-25-gfa5878760579 -c
+mv linux-5.15-rc5-25-gfa5878760579 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2969,6 +2970,14 @@ fi
 #
 #
 %changelog
+* Tue Oct 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211012gitfa5878760579.41]
+- Temporarily turn off selftests for bpf on ppc (Justin M. Forbes)
+
+* Tue Oct 12 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211012gitfa5878760579.40]
+- Enable KUNIT tests for redhat kernel-modules-internal (Nico Pache)
+- redhat: add *-matched meta packages to rpminspect emptyrpm config (Herton R. Krzesinski)
+- Use common config for NODES_SHIFT (Mark Salter)
+
 * Sat Oct 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc4.20211009git5d6ab0bb408f.37]
 - redhat: fix typo and make the output more silent for dist-git sync (Herton R. Krzesinski)
 
diff --git a/mod-internal.list b/mod-internal.list
index 258091f8d..f47d01eca 100644
--- a/mod-internal.list
+++ b/mod-internal.list
@@ -1,4 +1,27 @@
 dmatest
+kunit
+kunit-test
+ext4-inode-test
+list-test
+sysctl-test
+mptcp_crypto_test
+mptcp_token_test
+bitfield_kunit
+cmdline_kunit
+property-entry-test
+qos-test
+resource_kunit
+soc-topology-test
+string-stream-test
+test_linear_ranges
+test_bits
+test_kasan
+time_test
+fat_test
+rational-test
+test_list_sort
+slub_kunit
+lib_test
 locktorture
 mac80211_hwsim
 netdevsim
diff --git a/rpminspect.yaml b/rpminspect.yaml
index e540fbd45..f62742aa5 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -5,6 +5,9 @@ emptyrpm:
     expected_empty:
         - kernel
         - kernel-debug
+        - kernel-debug-devel-matched
+        - kernel-devel-matched
         - kernel-lpae
         - kernel-zfcpdump
+        - kernel-zfcpdump-devel-matched
         - kernel-zfcpdump-modules
diff --git a/sources b/sources
index dea2ac89b..d225cd551 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.15-rc5.tar.xz) = 94c5edb8020abdeb00dec17b34e4ca138b052da587be057e2d6fbac4a606559e6c8d96b00ae682f91685afbdae26f43c1872ba0054dd99d0ff662cb3857ebb76
-SHA512 (kernel-abi-stablelists-5.15.0-0.rc5.39.tar.bz2) = 491cfa43dd17df104bce96f5934893f2702541bbb7582a557bbcc174de989d6d3d7cdf6c93f603568b74d7c6bfc51f5bf35fb733e887c4ba707bdb266076b49f
-SHA512 (kernel-kabi-dw-5.15.0-0.rc5.39.tar.bz2) = 1f706caa13c481b4f46f1eb5fd8cb0e75b2c30a979a2ad5e95db412cd381740238d9e31e8b156f09aba5e195b1ed7360c2dbc7122589cbbbf2e27cc0d33f3936
+SHA512 (linux-5.15-rc5-25-gfa5878760579.tar.xz) = 2789478e400b3655aa0bc2672efc2226f25ce7cafa070e5813229145a7911fb4ca37ef1f48e5eb22ee08d6449660a3466c8cd56b1f20d7ac118d0bd81f5dcbf8
+SHA512 (kernel-abi-stablelists-5.15.0-0.rc5.20211012gitfa5878760579.41.tar.bz2) = 953b117ea57e61badd82a2bb1c3fb47a998f8e4ed1e25f3efabcdf41f7079a6fa63db459bee0cdcf4f68cd7c3cc177d5d02ceae94d74036f3470dadaaef977b6
+SHA512 (kernel-kabi-dw-5.15.0-0.rc5.20211012gitfa5878760579.41.tar.bz2) = 2d9f7714cf16b40a9001f45b60a13329eaa8e01313fbd682111dc356d9e9634dd6adee8f66eae2704a2f9ff11f43a44246caaadf2e5a235d888624215e2010f1