diff --git a/config/arm64/vanilla b/config/arm64/vanilla
index f8b198b..fe8cc86 100644
--- a/config/arm64/vanilla
+++ b/config/arm64/vanilla
@@ -3874,6 +3874,7 @@ CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB=m
 CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_F81604=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
@@ -3940,6 +3941,10 @@ CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
+# CONFIG_PPPOE_HASH_BITS_2 is not set
+CONFIG_PPPOE_HASH_BITS_4=y
+# CONFIG_PPPOE_HASH_BITS_8 is not set
+CONFIG_PPPOE_HASH_BITS=4
 CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
diff --git a/config/armv7hl/vanilla b/config/armv7hl/vanilla
index eed18a0..888fe10 100644
--- a/config/armv7hl/vanilla
+++ b/config/armv7hl/vanilla
@@ -3672,6 +3672,7 @@ CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB=m
 CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_F81604=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
@@ -3735,6 +3736,10 @@ CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
+# CONFIG_PPPOE_HASH_BITS_2 is not set
+CONFIG_PPPOE_HASH_BITS_4=y
+# CONFIG_PPPOE_HASH_BITS_8 is not set
+CONFIG_PPPOE_HASH_BITS=4
 CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
diff --git a/config/i386/vanilla b/config/i386/vanilla
index d602a8f..2cba057 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -3615,6 +3615,7 @@ CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB=m
 CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_F81604=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
@@ -3669,6 +3670,10 @@ CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
+# CONFIG_PPPOE_HASH_BITS_2 is not set
+CONFIG_PPPOE_HASH_BITS_4=y
+# CONFIG_PPPOE_HASH_BITS_8 is not set
+CONFIG_PPPOE_HASH_BITS=4
 CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
@@ -4908,7 +4913,6 @@ CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_SIFIVE is not set
 # CONFIG_GPIO_SYSCON is not set
 CONFIG_GPIO_TANGIER=m
-CONFIG_GPIO_VX855=m
 # CONFIG_GPIO_XILINX is not set
 CONFIG_GPIO_AMD_FCH=m
 # end of Memory mapped GPIO drivers
@@ -4916,6 +4920,7 @@ CONFIG_GPIO_AMD_FCH=m
 #
 # Port-mapped I/O GPIO drivers
 #
+CONFIG_GPIO_VX855=m
 CONFIG_GPIO_I8255=m
 CONFIG_GPIO_104_DIO_48E=m
 CONFIG_GPIO_104_IDIO_16=m
diff --git a/config/ppc64/vanilla b/config/ppc64/vanilla
index 78dd1ad..41539db 100644
--- a/config/ppc64/vanilla
+++ b/config/ppc64/vanilla
@@ -3311,6 +3311,10 @@ CONFIG_PPP_FILTER=y
 CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOE=m
+# CONFIG_PPPOE_HASH_BITS_2 is not set
+CONFIG_PPPOE_HASH_BITS_4=y
+# CONFIG_PPPOE_HASH_BITS_8 is not set
+CONFIG_PPPOE_HASH_BITS=4
 CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
diff --git a/config/ppc64le/vanilla b/config/ppc64le/vanilla
index 0480354..fc1467a 100644
--- a/config/ppc64le/vanilla
+++ b/config/ppc64le/vanilla
@@ -3202,6 +3202,10 @@ CONFIG_PPP_FILTER=y
 CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOE=m
+# CONFIG_PPPOE_HASH_BITS_2 is not set
+CONFIG_PPPOE_HASH_BITS_4=y
+# CONFIG_PPPOE_HASH_BITS_8 is not set
+CONFIG_PPPOE_HASH_BITS=4
 CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
diff --git a/config/riscv64/vanilla b/config/riscv64/vanilla
index fd5ecb7..b7a6a91 100644
--- a/config/riscv64/vanilla
+++ b/config/riscv64/vanilla
@@ -3322,6 +3322,7 @@ CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB=m
 CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_F81604=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
@@ -3381,6 +3382,10 @@ CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
+# CONFIG_PPPOE_HASH_BITS_2 is not set
+CONFIG_PPPOE_HASH_BITS_4=y
+# CONFIG_PPPOE_HASH_BITS_8 is not set
+CONFIG_PPPOE_HASH_BITS=4
 CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 34ad1fd..fca78d3 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -3721,6 +3721,7 @@ CONFIG_CAN_8DEV_USB=m
 CONFIG_CAN_EMS_USB=m
 CONFIG_CAN_ESD_USB=m
 CONFIG_CAN_ETAS_ES58X=m
+CONFIG_CAN_F81604=m
 CONFIG_CAN_GS_USB=m
 CONFIG_CAN_KVASER_USB=m
 CONFIG_CAN_MCBA_USB=m
@@ -3770,6 +3771,10 @@ CONFIG_PPP_MPPE=m
 CONFIG_PPP_MULTILINK=y
 CONFIG_PPPOATM=m
 CONFIG_PPPOE=m
+# CONFIG_PPPOE_HASH_BITS_2 is not set
+CONFIG_PPPOE_HASH_BITS_4=y
+# CONFIG_PPPOE_HASH_BITS_8 is not set
+CONFIG_PPPOE_HASH_BITS=4
 CONFIG_PPTP=m
 CONFIG_PPPOL2TP=m
 CONFIG_PPP_ASYNC=m
@@ -4952,13 +4957,13 @@ CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_MB86S7X is not set
 CONFIG_GPIO_TANGIER=m
-CONFIG_GPIO_VX855=m
 CONFIG_GPIO_AMD_FCH=m
 # end of Memory mapped GPIO drivers
 
 #
 # Port-mapped I/O GPIO drivers
 #
+CONFIG_GPIO_VX855=m
 CONFIG_GPIO_I8255=m
 CONFIG_GPIO_104_DIO_48E=m
 CONFIG_GPIO_104_IDIO_16=m
diff --git a/rpm/config.sh b/rpm/config.sh
index 3a0943d..ccdd89b 100644
--- a/rpm/config.sh
+++ b/rpm/config.sh
@@ -1,5 +1,5 @@
 # The version of the main tarball to use
-SRCVERSION=6.4-rc2-next-20230517
+SRCVERSION=6.4-rc2-next-20230518
 # variant of the kernel-source package, either empty or "-rt"
 VARIANT=-vanilla
 # Set to 1 to use the variant kernel for kernel-obs-build