diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index ea94519..c8f1fe3 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -7485,6 +7485,7 @@ CONFIG_DRM_RCAR_MIPI_DSI=m
 # CONFIG_DRM_RZG2L_MIPI_DSI is not set
 CONFIG_DRM_RCAR_VSP=y
 CONFIG_DRM_RCAR_WRITEBACK=y
+CONFIG_DRM_SHMOBILE=m
 CONFIG_DRM_SUN4I=m
 CONFIG_DRM_SUN6I_DSI=m
 CONFIG_DRM_SUN8I_DW_HDMI=m
@@ -12296,7 +12297,7 @@ CONFIG_SMB_SERVER=m
 # CONFIG_SMB_SERVER_SMBDIRECT is not set
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
-CONFIG_SMBFS_COMMON=m
+CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 CONFIG_AFS_FS=m
 # CONFIG_AFS_DEBUG is not set
@@ -12386,7 +12387,6 @@ CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=32768
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index e7bdffe..8e3d581 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -11781,7 +11781,7 @@ CONFIG_CIFS_FSCACHE=y
 CONFIG_SMB_SERVER=m
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
-CONFIG_SMBFS_COMMON=m
+CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 CONFIG_AFS_FS=m
 # CONFIG_AFS_DEBUG is not set
@@ -11870,7 +11870,6 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=32768
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
@@ -12256,6 +12255,7 @@ CONFIG_CRYPTO_DEV_ASPEED=m
 CONFIG_CRYPTO_DEV_ASPEED_HACE_HASH=y
 CONFIG_CRYPTO_DEV_ASPEED_HACE_CRYPTO=y
 CONFIG_CRYPTO_DEV_ASPEED_ACRY=y
+CONFIG_CRYPTO_DEV_JH7110=m
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_X509_CERTIFICATE_PARSER=y
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 67e2d03..f74f0c7 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -10280,7 +10280,7 @@ CONFIG_SMB_SERVER=m
 # CONFIG_SMB_SERVER_SMBDIRECT is not set
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
-CONFIG_SMBFS_COMMON=m
+CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 CONFIG_AFS_FS=m
 # CONFIG_AFS_DEBUG is not set
@@ -10370,7 +10370,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_INTEL_TXT=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 397d883..e3b155b 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -8042,7 +8042,7 @@ CONFIG_SMB_SERVER=m
 # CONFIG_SMB_SERVER_SMBDIRECT is not set
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
-CONFIG_SMBFS_COMMON=m
+CONFIG_SMBFS=m
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 CONFIG_9P_FS=m
@@ -8127,7 +8127,6 @@ CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index b96621e..8800bef 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -7916,7 +7916,7 @@ CONFIG_SMB_SERVER=m
 # CONFIG_SMB_SERVER_SMBDIRECT is not set
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
-CONFIG_SMBFS_COMMON=m
+CONFIG_SMBFS=m
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
 CONFIG_9P_FS=m
@@ -8001,7 +8001,6 @@ CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
diff --git a/config/riscv64/vanilla b/config/riscv64/vanilla
index f4f1c1c..9ff675d 100644
--- a/config/riscv64/vanilla
+++ b/config/riscv64/vanilla
@@ -1778,7 +1778,6 @@ CONFIG_ETHTOOL_NETLINK=y
 #
 # Device Drivers
 #
-CONFIG_ARM_AMBA=y
 CONFIG_HAVE_PCI=y
 CONFIG_PCI=y
 CONFIG_PCI_DOMAINS=y
@@ -4122,7 +4121,6 @@ CONFIG_RMI4_F55=y
 CONFIG_SERIO=y
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_AMBAKMI=m
 CONFIG_SERIO_PCIPS2=m
 CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_RAW=m
@@ -4186,8 +4184,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
 #
 # Non-8250 serial port support
 #
-CONFIG_SERIAL_AMBA_PL010=m
-CONFIG_SERIAL_AMBA_PL011=m
 CONFIG_SERIAL_EARLYCON_SEMIHOST=y
 # CONFIG_SERIAL_KGDB_NMI is not set
 # CONFIG_SERIAL_MAX3100 is not set
@@ -4352,7 +4348,6 @@ CONFIG_I2C_GPIO=m
 CONFIG_I2C_KEMPLD=m
 CONFIG_I2C_MICROCHIP_CORE=m
 CONFIG_I2C_MV64XXX=m
-CONFIG_I2C_NOMADIK=m
 CONFIG_I2C_OCORES=m
 CONFIG_I2C_PCA_PLATFORM=m
 # CONFIG_I2C_PXA_PCI is not set
@@ -4427,7 +4422,6 @@ CONFIG_SPI_MICROCHIP_CORE=m
 CONFIG_SPI_MICROCHIP_CORE_QSPI=m
 CONFIG_SPI_OC_TINY=m
 # CONFIG_SPI_PCI1XXXX is not set
-CONFIG_SPI_PL022=m
 # CONFIG_SPI_PXA2XX is not set
 # CONFIG_SPI_PXA2XX_PCI is not set
 CONFIG_SPI_RPCIF=m
@@ -4591,7 +4585,6 @@ CONFIG_GPIO_GRGPIO=m
 CONFIG_GPIO_HLWD=m
 CONFIG_GPIO_LOGICVC=m
 CONFIG_GPIO_MB86S7X=m
-CONFIG_GPIO_PL061=m
 CONFIG_GPIO_RCAR=m
 CONFIG_GPIO_SIFIVE=y
 CONFIG_GPIO_SYSCON=m
@@ -6230,6 +6223,7 @@ CONFIG_DRM_UDL=m
 CONFIG_DRM_AST=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_RZG2L_MIPI_DSI is not set
+CONFIG_DRM_SHMOBILE=m
 # CONFIG_DRM_SUN4I is not set
 CONFIG_DRM_QXL=m
 CONFIG_DRM_VIRTIO_GPU=m
@@ -7426,8 +7420,6 @@ CONFIG_MMC_CRYPTO=y
 # MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_DEBUG is not set
-CONFIG_MMC_ARMMMCI=m
-CONFIG_MMC_STM32_SDMMC=y
 CONFIG_MMC_SDHCI=m
 CONFIG_MMC_SDHCI_IO_ACCESSORS=y
 CONFIG_MMC_SDHCI_PCI=m
@@ -7754,8 +7746,6 @@ CONFIG_RTC_DRV_EFI=m
 # on-CPU RTC drivers
 #
 CONFIG_RTC_DRV_SH=m
-CONFIG_RTC_DRV_PL030=m
-CONFIG_RTC_DRV_PL031=m
 # CONFIG_RTC_DRV_SUN6I is not set
 CONFIG_RTC_DRV_CADENCE=m
 # CONFIG_RTC_DRV_FTRTC010 is not set
@@ -7775,16 +7765,14 @@ CONFIG_DMADEVICES=y
 # DMA Devices
 #
 CONFIG_DMA_ENGINE=y
-CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
 CONFIG_DMA_OF=y
 CONFIG_ALTERA_MSGDMA=m
-CONFIG_AMBA_PL08X=y
 CONFIG_DMA_SUN6I=m
 CONFIG_DW_AXI_DMAC=m
 # CONFIG_FSL_EDMA is not set
 # CONFIG_INTEL_IDMA64 is not set
 # CONFIG_INTEL_IDXD_BUS is not set
-CONFIG_PL330_DMA=m
 CONFIG_PLX_DMA=m
 CONFIG_XILINX_XDMA=m
 CONFIG_XILINX_ZYNQMP_DPDMA=m
@@ -8073,10 +8061,7 @@ CONFIG_RISCV_TIMER=y
 # end of Clock Source drivers
 
 CONFIG_MAILBOX=y
-CONFIG_ARM_MHU=m
-CONFIG_ARM_MHU_V2=m
 CONFIG_PLATFORM_MHU=m
-CONFIG_PL320_MBOX=y
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 CONFIG_POLARFIRE_SOC_MAILBOX=m
@@ -8212,7 +8197,6 @@ CONFIG_EXTCON_SM5502=m
 # CONFIG_EXTCON_USB_GPIO is not set
 CONFIG_EXTCON_USBC_TUSB320=m
 CONFIG_MEMORY=y
-CONFIG_ARM_PL172_MPMC=m
 CONFIG_FPGA_DFL_EMIF=m
 CONFIG_RENESAS_RPCIF=m
 CONFIG_IIO=m
@@ -9339,7 +9323,7 @@ CONFIG_SMB_SERVER=m
 # CONFIG_SMB_SERVER_SMBDIRECT is not set
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
-CONFIG_SMBFS_COMMON=m
+CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 CONFIG_AFS_FS=m
 # CONFIG_AFS_DEBUG is not set
@@ -9427,7 +9411,6 @@ CONFIG_SECURITY_INFINIBAND=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 08f3d69..8ecab64 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -10235,7 +10235,7 @@ CONFIG_SMB_SERVER=m
 # CONFIG_SMB_SERVER_SMBDIRECT is not set
 CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y
 CONFIG_SMB_SERVER_KERBEROS5=y
-CONFIG_SMBFS_COMMON=m
+CONFIG_SMBFS=m
 CONFIG_CODA_FS=m
 CONFIG_AFS_FS=m
 # CONFIG_AFS_DEBUG is not set
@@ -10325,7 +10325,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_PATH=y
 CONFIG_INTEL_TXT=y
 CONFIG_LSM_MMAP_MIN_ADDR=65536
-CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 CONFIG_HARDENED_USERCOPY=y
 CONFIG_FORTIFY_SOURCE=y
 # CONFIG_STATIC_USERMODEHELPER is not set
diff --git a/rpm/config.sh b/rpm/config.sh
index 5b0755c..a82a3d4 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
 # The version of the main tarball to use
-SRCVERSION=6.4-rc3-next-20230524
+SRCVERSION=6.4-rc3-next-20230525
 # variant of the kernel-source package, either empty or "-rt"
 VARIANT=-vanilla
 # Set to 1 to use the variant kernel for kernel-obs-build