diff --git a/Makefile.rhelver b/Makefile.rhelver
index bd68da515..3943824d4 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 = 14
+RHEL_RELEASE = 16
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 4fbebff72..c9094c8ab 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -4015,7 +4015,7 @@ CONFIG_MAX5522=m
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 CONFIG_MAX77620_THERMAL=m
-CONFIG_MAX77620_WATCHDOG=y
+CONFIG_MAX77620_WATCHDOG=m
 # CONFIG_MAX9611 is not set
 CONFIG_MAXIM_THERMOCOUPLE=m
 CONFIG_MAXLINEAR_GPHY=m
@@ -6288,8 +6288,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 1649d3c12..af3ae3dd6 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -937,6 +937,7 @@ CONFIG_COMMON_CLK_HI3660=y
 CONFIG_COMMON_CLK_HI3798CV200=y
 # CONFIG_COMMON_CLK_HI6220 is not set
 # CONFIG_COMMON_CLK_LAN966X is not set
+CONFIG_COMMON_CLK_MAX77686=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_QCOM is not set
@@ -2012,6 +2013,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_MAX77620=y
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_ML_IOH is not set
@@ -3202,6 +3204,8 @@ CONFIG_MARVELL_PHY=m
 # CONFIG_MAX5522 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_MAX77620_THERMAL=m
+CONFIG_MAX77620_WATCHDOG=y
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 CONFIG_MAXLINEAR_GPHY=m
 CONFIG_MAX_SKB_FRAGS=17
@@ -3334,7 +3338,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m
 # CONFIG_MFD_MADERA is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX597X is not set
-# CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77620=y
 # CONFIG_MFD_MAX77650 is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
@@ -4472,6 +4476,7 @@ CONFIG_PINCTRL_IPROC_GPIO=y
 CONFIG_PINCTRL_LAKEFIELD=m
 # CONFIG_PINCTRL_LPASS_LPI is not set
 # CONFIG_PINCTRL_LYNXPOINT is not set
+CONFIG_PINCTRL_MAX77620=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
@@ -4768,7 +4773,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-# CONFIG_RDMA_RXE is not set
+CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 # CONFIG_RDS is not set
 CONFIG_RD_XZ=y
@@ -4903,8 +4908,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -4983,6 +4988,7 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 CONFIG_RTC_DRV_MAX6902=m
 # CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX77686=m
 CONFIG_RTC_DRV_MCP795=m
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_NCT3018Y is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index e1a5d3024..a4fb34c2f 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -3991,7 +3991,7 @@ CONFIG_MAX5522=m
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
 CONFIG_MAX77620_THERMAL=m
-CONFIG_MAX77620_WATCHDOG=y
+CONFIG_MAX77620_WATCHDOG=m
 # CONFIG_MAX9611 is not set
 CONFIG_MAXIM_THERMOCOUPLE=m
 CONFIG_MAXLINEAR_GPHY=m
@@ -6261,8 +6261,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index b3b2396a0..53ec75edf 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -937,6 +937,7 @@ CONFIG_COMMON_CLK_HI3660=y
 CONFIG_COMMON_CLK_HI3798CV200=y
 # CONFIG_COMMON_CLK_HI6220 is not set
 # CONFIG_COMMON_CLK_LAN966X is not set
+CONFIG_COMMON_CLK_MAX77686=y
 # CONFIG_COMMON_CLK_MAX9485 is not set
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_QCOM is not set
@@ -1996,6 +1997,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MAX732X is not set
+CONFIG_GPIO_MAX77620=y
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MC33880 is not set
 # CONFIG_GPIO_ML_IOH is not set
@@ -3181,6 +3183,8 @@ CONFIG_MARVELL_PHY=m
 # CONFIG_MAX5522 is not set
 # CONFIG_MAX5821 is not set
 # CONFIG_MAX63XX_WATCHDOG is not set
+CONFIG_MAX77620_THERMAL=m
+CONFIG_MAX77620_WATCHDOG=y
 # CONFIG_MAXIM_THERMOCOUPLE is not set
 CONFIG_MAXLINEAR_GPHY=m
 CONFIG_MAX_SKB_FRAGS=17
@@ -3313,7 +3317,7 @@ CONFIG_MFD_INTEL_M10_BMC_SPI=m
 # CONFIG_MFD_MADERA is not set
 # CONFIG_MFD_MAX14577 is not set
 # CONFIG_MFD_MAX597X is not set
-# CONFIG_MFD_MAX77620 is not set
+CONFIG_MFD_MAX77620=y
 # CONFIG_MFD_MAX77650 is not set
 # CONFIG_MFD_MAX77686 is not set
 # CONFIG_MFD_MAX77693 is not set
@@ -4449,6 +4453,7 @@ CONFIG_PINCTRL_IPROC_GPIO=y
 CONFIG_PINCTRL_LAKEFIELD=m
 # CONFIG_PINCTRL_LPASS_LPI is not set
 # CONFIG_PINCTRL_LYNXPOINT is not set
+CONFIG_PINCTRL_MAX77620=y
 # CONFIG_PINCTRL_MCP23S08 is not set
 # CONFIG_PINCTRL_MDM9615 is not set
 # CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
@@ -4745,7 +4750,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-# CONFIG_RDMA_RXE is not set
+CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 # CONFIG_RDS is not set
 CONFIG_RD_XZ=y
@@ -4880,8 +4885,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -4960,6 +4965,7 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 CONFIG_RTC_DRV_MAX6902=m
 # CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX77686=m
 CONFIG_RTC_DRV_MCP795=m
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_NCT3018Y is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 14c6160d2..ba52e495a 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -6256,8 +6256,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index e25595474..812abae0a 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -6231,8 +6231,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 19cd686cf..fa8a4a011 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -6089,8 +6089,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 8fb534f9a..b2b459d08 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -6064,8 +6064,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 5def2ffc9..3fa357d5f 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -5183,8 +5183,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index d0e7a59c8..eaa6b239b 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -4515,7 +4515,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-# CONFIG_RDMA_RXE is not set
+CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 # CONFIG_RDS is not set
 CONFIG_RD_XZ=y
@@ -4618,8 +4618,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -4700,6 +4700,7 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX77686=m
 # CONFIG_RTC_DRV_MCP795 is not set
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_NCT3018Y is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 63de6835b..d765806a5 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -5154,8 +5154,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 42f76e7d9..d4a205793 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -4494,7 +4494,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-# CONFIG_RDMA_RXE is not set
+CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 # CONFIG_RDS is not set
 CONFIG_RD_XZ=y
@@ -4597,8 +4597,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -4679,6 +4679,7 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX77686=m
 # CONFIG_RTC_DRV_MCP795 is not set
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_NCT3018Y is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index c05a3fdd9..899af9912 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -5115,8 +5115,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index d9fa349ce..0a088e216 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -4458,7 +4458,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-# CONFIG_RDMA_RXE is not set
+CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 # CONFIG_RDS is not set
 CONFIG_RD_XZ=y
@@ -4560,8 +4560,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -4639,6 +4639,7 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX77686=m
 # CONFIG_RTC_DRV_MCP795 is not set
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_NCT3018Y is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 3d6b3dabb..d1410940c 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -5086,8 +5086,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 421fc2090..05ccfece1 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -4437,7 +4437,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-# CONFIG_RDMA_RXE is not set
+CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 # CONFIG_RDS is not set
 CONFIG_RD_XZ=y
@@ -4539,8 +4539,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -4618,6 +4618,7 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX77686=m
 # CONFIG_RTC_DRV_MCP795 is not set
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_NCT3018Y is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 551f56977..9adfa730c 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -4452,7 +4452,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-# CONFIG_RDMA_RXE is not set
+CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 # CONFIG_RDS is not set
 CONFIG_RD_XZ=y
@@ -4554,8 +4554,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -4633,6 +4633,7 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX77686=m
 # CONFIG_RTC_DRV_MCP795 is not set
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_NCT3018Y is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index ab960e1b9..3a22deadc 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -5533,8 +5533,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 4370b8504..d1d8ea6dc 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -4694,7 +4694,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-# CONFIG_RDMA_RXE is not set
+CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 # CONFIG_RDS is not set
 CONFIG_RD_XZ=y
@@ -4797,8 +4797,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -4876,6 +4876,7 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX77686=m
 # CONFIG_RTC_DRV_MCP795 is not set
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_NCT3018Y is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index cc1b639ba..704769db7 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5505,8 +5505,8 @@ CONFIG_ROMFS_BACKED_BY_BLOCK=y
 CONFIG_ROMFS_FS=m
 CONFIG_ROSE=m
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 51fd04c47..eb7a2ac20 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -4672,7 +4672,7 @@ CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_LZO=y
-# CONFIG_RDMA_RXE is not set
+CONFIG_RDMA_RXE=m
 CONFIG_RDMA_SIW=m
 # CONFIG_RDS is not set
 CONFIG_RD_XZ=y
@@ -4775,8 +4775,8 @@ CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
 # CONFIG_ROHM_BU27034 is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA1=y
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2 is not set
-# CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA is not set
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_AES_SHA2=y
+CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_CAMELLIA=y
 # CONFIG_RPCSEC_GSS_KRB5_ENCTYPES_DES is not set
 CONFIG_RPCSEC_GSS_KRB5_KUNIT_TEST=m
 CONFIG_RPCSEC_GSS_KRB5=m
@@ -4854,6 +4854,7 @@ CONFIG_RTC_DRV_M48T59=m
 CONFIG_RTC_DRV_MAX6900=m
 # CONFIG_RTC_DRV_MAX6902 is not set
 # CONFIG_RTC_DRV_MAX6916 is not set
+CONFIG_RTC_DRV_MAX77686=m
 # CONFIG_RTC_DRV_MCP795 is not set
 CONFIG_RTC_DRV_MSM6242=m
 # CONFIG_RTC_DRV_NCT3018Y is not set
diff --git a/kernel.spec b/kernel.spec
index c8f3abb71..91e056e25 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -148,13 +148,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.4.0
 %define specversion 6.4.0
 %define patchversion 6.4
-%define pkgrelease 0.rc0.20230505git78b421b6a7c6.14
+%define pkgrelease 0.rc1.16
 %define kversion 6
-%define tarfile_release 6.3-13164-g78b421b6a7c6
+%define tarfile_release 6.4-rc1
 # This is needed to do merge window version magic
 %define patchlevel 4
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20230505git78b421b6a7c6.14%{?buildid}%{?dist}
+%define specrelease 0.rc1.16%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.4.0
 
@@ -3290,9 +3290,11 @@ fi
 %endif
 
 # empty meta-package
+%if %{with_up}
 %ifnarch %nobuildarches noarch
 %files
 %endif
+%endif
 
 # This is %%{image_install_path} on an arch where that includes ELF files,
 # or empty otherwise.
@@ -3408,10 +3410,23 @@ fi
 #
 #
 %changelog
-* Fri May 05 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc0.78b421b6a7c6.14]
+* Mon May 08 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc1.16]
+- Linux v6.4.0-0.rc1
+
+* Sun May 07 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc0.fc4354c6e5c2.15]
+- Linux v6.4.0-0.rc0.fc4354c6e5c2
+
+* Sat May 06 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc0.2e1e1337881b.14]
+- redhat: Remove editconfig (Prarit Bhargava)
+- redhat: configs: fix CONFIG_WERROR replace in build_configs (Jan Stancek)
+- redhat/configs: enable Maxim MAX77620 PMIC for RHEL (Mark Salter)
+- kernel.spec: skip kernel meta package when building without up (Jan Stancek)
+- redhat/configs: enable RDMA_RXE for RHEL (Kamal Heib) [2022578]
+- redhat/configs: update RPCSEC_GSS_KRB5 configs (Scott Mayhew)
 - redhat/Makefile: Support building linux-next (Thorsten Leemhuis)
 - redhat/Makefile: support building stable-rc versions (Thorsten Leemhuis)
 - redhat/Makefile: Add target to print DISTRELEASETAG (Thorsten Leemhuis)
+- Linux v6.4.0-0.rc0.2e1e1337881b
 
 * Fri May 05 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.4.0-0.rc0.78b421b6a7c6.13]
 - Remove EXPERT from ARCH_FORCE_MAX_ORDER for aarch64 (Justin M. Forbes)
diff --git a/patch-6.4-redhat.patch b/patch-6.4-redhat.patch
index 98a7c582d..c35bfca83 100644
--- a/patch-6.4-redhat.patch
+++ b/patch-6.4-redhat.patch
@@ -118,7 +118,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 5ac8f263f9b0..1f5b68c93e97 100644
+index 9d765ebcccf1..3c4b4754e450 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 4d114d621..b936ed37a 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.3-13164-g78b421b6a7c6.tar.xz) = ebb3534c1182c068d0380dc2c44f9d04f4317e4765f81a41745034fda27ed1b2a4cd6fb2af0d54fd9dc809873859fee0bea4c53f753e1441610325fd60504c95
-SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = cbc0ef2981a2fa0971b5cdc956fcb75ade57e82933014352dd50daafed1f5056fa4e48cce50606d5672538853f41dc67569512b69688594d8c5949ac8eb75e65
-SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = 50fb4bf3c44ac33e19e26764e7da367fd1f03a452c207a310686aaf6c62ab2e0fb2c736832ed9ee71e869f54f02a80de5f053278fedfa40c424e9542c5699df4
+SHA512 (linux-6.4-rc1.tar.xz) = 42369fc2318b92cdd11eecffd071d852a8eba6796cf6e40473412b956e3d5f2ad79201f103e3d45f2307e59768d3d3b92f111b594f4226effa75c0422ea2cde0
+SHA512 (kernel-abi-stablelists-6.4.0.tar.bz2) = c6703c03dcecf2654162f2daf0ac90432f12ab5f608097b89b3e835910c9f8ed020b669997282307733933fc805e84fdead5d2dbe246d2d0737adf1a3aa45869
+SHA512 (kernel-kabi-dw-6.4.0.tar.bz2) = f56c7cc16ce9ef3ce4abea7b19a6f56a44663db057ca73a64970ded82503da74ba5240ecf0b1a7835dd75b980b3710ad7ebf86124bce22c9c9f4f2dda48fccbf