diff --git a/Makefile b/Makefile
index ac292d6dd262..57b81666f9ef 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 5
 PATCHLEVEL = 9
 SUBLEVEL = 8
-EXTRAVERSION =
+EXTRAVERSION = -rc3
 NAME = Kleptomaniac Octopus
 
 # *DOCUMENTATION*
diff --git a/arch/x86/configs/thdkernel-latest_defconfig b/arch/x86/configs/thdkernel-latest_defconfig
index 4ef20ad16d85..958019cd315a 100644
--- a/arch/x86/configs/thdkernel-latest_defconfig
+++ b/arch/x86/configs/thdkernel-latest_defconfig
@@ -1,4 +1,4 @@
-CONFIG_LOCALVERSION="-thdkernel-rc3"
+CONFIG_LOCALVERSION="-thdkernel"
 CONFIG_KERNEL_ZSTD=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -80,6 +80,7 @@ CONFIG_KEXEC_FILE=y
 CONFIG_KEXEC_SIG=y
 CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
 CONFIG_CRASH_DUMP=y
+CONFIG_LIVEPATCH=y
 CONFIG_PM_WAKELOCKS=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
@@ -140,6 +141,7 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODULE_SIG_SHA512=y
 CONFIG_MODULE_COMPRESS=y
+CONFIG_MODULE_COMPRESS_XZ=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_WBT=y
@@ -695,6 +697,7 @@ CONFIG_DUMMY_IRQ=m
 # CONFIG_TIFM_7XX1 is not set
 CONFIG_SRAM=y
 CONFIG_EEPROM_93CX6=m
+CONFIG_INTEL_MEI_ME=y
 CONFIG_INTEL_MEI_TXE=y
 CONFIG_INTEL_MEI_HDCP=y
 CONFIG_INTEL_MIC_BUS=y
@@ -1176,7 +1179,7 @@ CONFIG_TRACE_SINK=m
 CONFIG_SERIAL_DEV_BUS=y
 CONFIG_TTY_PRINTK=y
 CONFIG_VIRTIO_CONSOLE=y
-CONFIG_IPMI_HANDLER=y
+CONFIG_IPMI_HANDLER=m
 CONFIG_IPMI_DEVICE_INTERFACE=m
 CONFIG_IPMI_SI=m
 CONFIG_IPMI_SSIF=m
@@ -1292,7 +1295,7 @@ CONFIG_THERMAL_EMULATION=y
 CONFIG_INTEL_POWERCLAMP=y
 CONFIG_X86_PKG_TEMP_THERMAL=y
 CONFIG_INT340X_THERMAL=y
-CONFIG_INT3406_THERMAL=y
+CONFIG_INT3406_THERMAL=m
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_SYSFS=y
 CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
@@ -1482,6 +1485,7 @@ CONFIG_SND_HDA_CODEC_REALTEK=m
 CONFIG_SND_HDA_CODEC_ANALOG=m
 CONFIG_SND_HDA_CODEC_VIA=m
 CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_GENERIC=m
 CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
 CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM=y
 CONFIG_SND_HDA_PREALLOC_SIZE=64
@@ -1508,7 +1512,6 @@ CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI is not set
-CONFIG_SND_SOC_INTEL_SKL=m
 CONFIG_SND_SOC_INTEL_CFL=m
 CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
@@ -1843,6 +1846,7 @@ CONFIG_VFIO_PCI_VGA=y
 CONFIG_VFIO_MDEV=m
 CONFIG_VFIO_MDEV_DEVICE=m
 CONFIG_VIRT_DRIVERS=y
+CONFIG_VBOXGUEST=y
 CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PMEM=m
 CONFIG_VIRTIO_BALLOON=y
@@ -1962,7 +1966,7 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y
 # CONFIG_PRINT_QUOTA_WARNING is not set
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=y
 CONFIG_CUSE=m
 CONFIG_VIRTIO_FS=m
@@ -2130,7 +2134,7 @@ CONFIG_DEFAULT_SECURITY_APPARMOR=y
 CONFIG_LSM="lockdown,yama,integrity,apparmor"
 CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
 CONFIG_CRYPTO_USER=m
-CONFIG_CRYPTO_PCRYPT=y
+CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_ECRDSA=y
 CONFIG_CRYPTO_CURVE25519=y
@@ -2225,6 +2229,7 @@ CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
+CONFIG_HEADERS_INSTALL=y
 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
 CONFIG_KGDB=y
 CONFIG_KGDB_LOW_LEVEL_TRAP=y
@@ -2249,8 +2254,6 @@ CONFIG_MMIOTRACE=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_HIST_TRIGGERS=y
-CONFIG_SAMPLES=y
-CONFIG_SAMPLE_TRACE_PRINTK=m
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK_DBGP=y
 CONFIG_EARLY_PRINTK_USB_XDBC=y