diff --git a/Makefile.rhelver b/Makefile.rhelver
index 7db7c7804..4ef64a680 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 = 18
+RHEL_RELEASE = 20
 
 #
 # RHEL_REBASE_NUM
diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config
index 14a9ff157..5ef174422 100644
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@@ -3352,7 +3352,7 @@ CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
 CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_PLATFORM_SUPPORT is not set
@@ -3360,7 +3360,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
-# CONFIG_MEDIA_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MEDIA_TEST_SUPPORT is not set
 CONFIG_MEDIA_TUNER_M88RS6000T=m
@@ -6913,7 +6913,7 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_QCOM_PMIC is not set
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_RT1719 is not set
-# CONFIG_TYPEC_STUSB160X is not set
+CONFIG_TYPEC_STUSB160X=m
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_TCPCI_MAXIM is not set
 CONFIG_TYPEC_TCPM=m
@@ -7016,11 +7016,11 @@ CONFIG_USB_GSPCA_CPIA1=m
 # CONFIG_USB_GSPCA_DTCS033 is not set
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
+# CONFIG_USB_GSPCA is not set
 CONFIG_USB_GSPCA_JEILINJ=m
 CONFIG_USB_GSPCA_JL2005BCD=m
 # CONFIG_USB_GSPCA_KINECT is not set
 CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_NW80X=m
@@ -7132,7 +7132,7 @@ CONFIG_USB_PRINTER=m
 CONFIG_USB_PULSE8_CEC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
+# CONFIG_USB_PWC is not set
 # CONFIG_USB_QCOM_EUD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_RAINSHADOW_CEC=m
@@ -7141,7 +7141,7 @@ CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_RTL8153_ECM=m
-CONFIG_USB_S2255=m
+# CONFIG_USB_S2255 is not set
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
@@ -7254,6 +7254,7 @@ CONFIG_USERFAULTFD=y
 CONFIG_USER_NS=y
 CONFIG_UTS_NS=y
 CONFIG_UV_SYSFS=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_VALIDATE_FS_PARSER is not set
diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config
index 70a42131e..9d0ac9eec 100644
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@@ -3331,7 +3331,7 @@ CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
 CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_PLATFORM_SUPPORT is not set
@@ -3339,7 +3339,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
-# CONFIG_MEDIA_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MEDIA_TEST_SUPPORT is not set
 CONFIG_MEDIA_TUNER_M88RS6000T=m
@@ -6888,7 +6888,7 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_QCOM_PMIC is not set
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_RT1719 is not set
-# CONFIG_TYPEC_STUSB160X is not set
+CONFIG_TYPEC_STUSB160X=m
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_TCPCI_MAXIM is not set
 CONFIG_TYPEC_TCPM=m
@@ -6991,11 +6991,11 @@ CONFIG_USB_GSPCA_CPIA1=m
 # CONFIG_USB_GSPCA_DTCS033 is not set
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
+# CONFIG_USB_GSPCA is not set
 CONFIG_USB_GSPCA_JEILINJ=m
 CONFIG_USB_GSPCA_JL2005BCD=m
 # CONFIG_USB_GSPCA_KINECT is not set
 CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_NW80X=m
@@ -7107,7 +7107,7 @@ CONFIG_USB_PRINTER=m
 CONFIG_USB_PULSE8_CEC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
+# CONFIG_USB_PWC is not set
 # CONFIG_USB_QCOM_EUD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_RAINSHADOW_CEC=m
@@ -7116,7 +7116,7 @@ CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_RTL8153_ECM=m
-CONFIG_USB_S2255=m
+# CONFIG_USB_S2255 is not set
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
@@ -7229,6 +7229,7 @@ CONFIG_USERFAULTFD=y
 CONFIG_USER_NS=y
 CONFIG_UTS_NS=y
 CONFIG_UV_SYSFS=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_VALIDATE_FS_PARSER is not set
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 4d0b81a9a..89d363f49 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -3348,7 +3348,7 @@ CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
 CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_PLATFORM_SUPPORT is not set
@@ -3356,7 +3356,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
-# CONFIG_MEDIA_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MEDIA_TEST_SUPPORT is not set
 CONFIG_MEDIA_TUNER_M88RS6000T=m
@@ -6909,7 +6909,7 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_QCOM_PMIC is not set
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_RT1719 is not set
-# CONFIG_TYPEC_STUSB160X is not set
+CONFIG_TYPEC_STUSB160X=m
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_TCPCI_MAXIM is not set
 CONFIG_TYPEC_TCPM=m
@@ -7012,11 +7012,11 @@ CONFIG_USB_GSPCA_CPIA1=m
 # CONFIG_USB_GSPCA_DTCS033 is not set
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
+# CONFIG_USB_GSPCA is not set
 CONFIG_USB_GSPCA_JEILINJ=m
 CONFIG_USB_GSPCA_JL2005BCD=m
 # CONFIG_USB_GSPCA_KINECT is not set
 CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_NW80X=m
@@ -7128,7 +7128,7 @@ CONFIG_USB_PRINTER=m
 CONFIG_USB_PULSE8_CEC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
+# CONFIG_USB_PWC is not set
 # CONFIG_USB_QCOM_EUD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_RAINSHADOW_CEC=m
@@ -7137,7 +7137,7 @@ CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_RTL8153_ECM=m
-CONFIG_USB_S2255=m
+# CONFIG_USB_S2255 is not set
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
@@ -7250,6 +7250,7 @@ CONFIG_USERFAULTFD=y
 CONFIG_USER_NS=y
 CONFIG_UTS_NS=y
 CONFIG_UV_SYSFS=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_VALIDATE_FS_PARSER is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 8cd2d03ff..68b847222 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -3327,7 +3327,7 @@ CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
 CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_PLATFORM_SUPPORT is not set
@@ -3335,7 +3335,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
-# CONFIG_MEDIA_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MEDIA_TEST_SUPPORT is not set
 CONFIG_MEDIA_TUNER_M88RS6000T=m
@@ -6884,7 +6884,7 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_QCOM_PMIC is not set
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_RT1719 is not set
-# CONFIG_TYPEC_STUSB160X is not set
+CONFIG_TYPEC_STUSB160X=m
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_TCPCI_MAXIM is not set
 CONFIG_TYPEC_TCPM=m
@@ -6987,11 +6987,11 @@ CONFIG_USB_GSPCA_CPIA1=m
 # CONFIG_USB_GSPCA_DTCS033 is not set
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
+# CONFIG_USB_GSPCA is not set
 CONFIG_USB_GSPCA_JEILINJ=m
 CONFIG_USB_GSPCA_JL2005BCD=m
 # CONFIG_USB_GSPCA_KINECT is not set
 CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_NW80X=m
@@ -7103,7 +7103,7 @@ CONFIG_USB_PRINTER=m
 CONFIG_USB_PULSE8_CEC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
+# CONFIG_USB_PWC is not set
 # CONFIG_USB_QCOM_EUD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_RAINSHADOW_CEC=m
@@ -7112,7 +7112,7 @@ CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_RTL8153_ECM=m
-CONFIG_USB_S2255=m
+# CONFIG_USB_S2255 is not set
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
@@ -7225,6 +7225,7 @@ CONFIG_USERFAULTFD=y
 CONFIG_USER_NS=y
 CONFIG_UTS_NS=y
 CONFIG_UV_SYSFS=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_VALIDATE_FS_PARSER is not set
diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config
index 98ac8f9d2..e22e17ba8 100644
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@@ -3442,7 +3442,7 @@ CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
 CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_PLATFORM_SUPPORT is not set
@@ -3450,7 +3450,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
-# CONFIG_MEDIA_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MEDIA_TEST_SUPPORT is not set
 CONFIG_MEDIA_TUNER_M88RS6000T=m
@@ -7062,7 +7062,7 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_QCOM_PMIC is not set
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_RT1719 is not set
-# CONFIG_TYPEC_STUSB160X is not set
+CONFIG_TYPEC_STUSB160X=m
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_TCPCI_MAXIM is not set
 CONFIG_TYPEC_TCPM=m
@@ -7168,11 +7168,11 @@ CONFIG_USB_GSPCA_CPIA1=m
 # CONFIG_USB_GSPCA_DTCS033 is not set
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
+# CONFIG_USB_GSPCA is not set
 CONFIG_USB_GSPCA_JEILINJ=m
 CONFIG_USB_GSPCA_JL2005BCD=m
 # CONFIG_USB_GSPCA_KINECT is not set
 CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_NW80X=m
@@ -7285,7 +7285,7 @@ CONFIG_USB_PRINTER=m
 CONFIG_USB_PULSE8_CEC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
+# CONFIG_USB_PWC is not set
 # CONFIG_USB_QCOM_EUD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_RAINSHADOW_CEC=m
@@ -7294,7 +7294,7 @@ CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_RTL8153_ECM=m
-CONFIG_USB_S2255=m
+# CONFIG_USB_S2255 is not set
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
@@ -7407,6 +7407,7 @@ CONFIG_USERFAULTFD=y
 CONFIG_USER_NS=y
 CONFIG_UTS_NS=y
 CONFIG_UV_SYSFS=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_VALIDATE_FS_PARSER is not set
@@ -7453,6 +7454,7 @@ CONFIG_VHOST_VSOCK=m
 # CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV748X is not set
 # CONFIG_VIDEO_ADV7511 is not set
 # CONFIG_VIDEO_ADV7604 is not set
 # CONFIG_VIDEO_ADV7842 is not set
@@ -7525,6 +7527,7 @@ CONFIG_VIDEO_HDPVR=m
 # CONFIG_VIDEO_IMX412 is not set
 # CONFIG_VIDEO_IMX415 is not set
 # CONFIG_VIDEO_IPU3_CIO2 is not set
+# CONFIG_VIDEO_ISL7998X is not set
 # CONFIG_VIDEO_IVTV_ALSA is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_KS0127 is not set
@@ -7532,6 +7535,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_LM3646 is not set
 # CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_MAX9286 is not set
 # CONFIG_VIDEO_MEYE is not set
 # CONFIG_VIDEO_ML86V7667 is not set
 # CONFIG_VIDEO_MSP3400 is not set
diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config
index f0c3f33da..68635c181 100644
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@@ -3421,7 +3421,7 @@ CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CEC_RC=y
 CONFIG_MEDIA_CEC_SUPPORT=y
-# CONFIG_MEDIA_CONTROLLER is not set
+CONFIG_MEDIA_CONTROLLER=y
 # CONFIG_MEDIA_DIGITAL_TV_SUPPORT is not set
 CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_PLATFORM_SUPPORT is not set
@@ -3429,7 +3429,7 @@ CONFIG_MEDIA_PCI_SUPPORT=y
 # CONFIG_MEDIA_SDR_SUPPORT is not set
 CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
 CONFIG_MEDIA_SUPPORT_FILTER=y
-# CONFIG_MEDIA_SUPPORT is not set
+CONFIG_MEDIA_SUPPORT=m
 # CONFIG_MEDIATEK_GE_PHY is not set
 # CONFIG_MEDIA_TEST_SUPPORT is not set
 CONFIG_MEDIA_TUNER_M88RS6000T=m
@@ -7037,7 +7037,7 @@ CONFIG_TYPEC_MUX_PI3USB30532=m
 # CONFIG_TYPEC_QCOM_PMIC is not set
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_RT1719 is not set
-# CONFIG_TYPEC_STUSB160X is not set
+CONFIG_TYPEC_STUSB160X=m
 CONFIG_TYPEC_TCPCI=m
 # CONFIG_TYPEC_TCPCI_MAXIM is not set
 CONFIG_TYPEC_TCPM=m
@@ -7143,11 +7143,11 @@ CONFIG_USB_GSPCA_CPIA1=m
 # CONFIG_USB_GSPCA_DTCS033 is not set
 CONFIG_USB_GSPCA_ETOMS=m
 CONFIG_USB_GSPCA_FINEPIX=m
+# CONFIG_USB_GSPCA is not set
 CONFIG_USB_GSPCA_JEILINJ=m
 CONFIG_USB_GSPCA_JL2005BCD=m
 # CONFIG_USB_GSPCA_KINECT is not set
 CONFIG_USB_GSPCA_KONICA=m
-CONFIG_USB_GSPCA=m
 CONFIG_USB_GSPCA_MARS=m
 CONFIG_USB_GSPCA_MR97310A=m
 CONFIG_USB_GSPCA_NW80X=m
@@ -7260,7 +7260,7 @@ CONFIG_USB_PRINTER=m
 CONFIG_USB_PULSE8_CEC=m
 # CONFIG_USB_PWC_DEBUG is not set
 CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_PWC=m
+# CONFIG_USB_PWC is not set
 # CONFIG_USB_QCOM_EUD is not set
 # CONFIG_USB_R8A66597_HCD is not set
 CONFIG_USB_RAINSHADOW_CEC=m
@@ -7269,7 +7269,7 @@ CONFIG_USB_ROLE_SWITCH=y
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_RTL8153_ECM=m
-CONFIG_USB_S2255=m
+# CONFIG_USB_S2255 is not set
 CONFIG_USB_SERIAL_AIRCABLE=m
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
@@ -7382,6 +7382,7 @@ CONFIG_USERFAULTFD=y
 CONFIG_USER_NS=y
 CONFIG_UTS_NS=y
 CONFIG_UV_SYSFS=m
+# CONFIG_V4L2_FLASH_LED_CLASS is not set
 # CONFIG_V4L_MEM2MEM_DRIVERS is not set
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 # CONFIG_VALIDATE_FS_PARSER is not set
@@ -7428,6 +7429,7 @@ CONFIG_VHOST_VSOCK=m
 # CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV748X is not set
 # CONFIG_VIDEO_ADV7511 is not set
 # CONFIG_VIDEO_ADV7604 is not set
 # CONFIG_VIDEO_ADV7842 is not set
@@ -7500,6 +7502,7 @@ CONFIG_VIDEO_HDPVR=m
 # CONFIG_VIDEO_IMX412 is not set
 # CONFIG_VIDEO_IMX415 is not set
 # CONFIG_VIDEO_IPU3_CIO2 is not set
+# CONFIG_VIDEO_ISL7998X is not set
 # CONFIG_VIDEO_IVTV_ALSA is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_KS0127 is not set
@@ -7507,6 +7510,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_LM3646 is not set
 # CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_MAX9286 is not set
 # CONFIG_VIDEO_MEYE is not set
 # CONFIG_VIDEO_ML86V7667 is not set
 # CONFIG_VIDEO_MSP3400 is not set
diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config
index 26a308d43..a0683f870 100644
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@@ -7256,6 +7256,7 @@ CONFIG_VHOST_VSOCK=m
 # CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV748X is not set
 # CONFIG_VIDEO_ADV7511 is not set
 # CONFIG_VIDEO_ADV7604 is not set
 # CONFIG_VIDEO_ADV7842 is not set
@@ -7328,6 +7329,7 @@ CONFIG_VIDEO_HDPVR=m
 # CONFIG_VIDEO_IMX412 is not set
 # CONFIG_VIDEO_IMX415 is not set
 # CONFIG_VIDEO_IPU3_CIO2 is not set
+# CONFIG_VIDEO_ISL7998X is not set
 # CONFIG_VIDEO_IVTV_ALSA is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_KS0127 is not set
@@ -7335,6 +7337,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_LM3646 is not set
 # CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_MAX9286 is not set
 # CONFIG_VIDEO_MEYE is not set
 # CONFIG_VIDEO_ML86V7667 is not set
 # CONFIG_VIDEO_MSP3400 is not set
diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config
index 676ee6275..76771c4e1 100644
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@@ -7232,6 +7232,7 @@ CONFIG_VHOST_VSOCK=m
 # CONFIG_VIDEO_ADV7183 is not set
 # CONFIG_VIDEO_ADV7343 is not set
 # CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_ADV748X is not set
 # CONFIG_VIDEO_ADV7511 is not set
 # CONFIG_VIDEO_ADV7604 is not set
 # CONFIG_VIDEO_ADV7842 is not set
@@ -7304,6 +7305,7 @@ CONFIG_VIDEO_HDPVR=m
 # CONFIG_VIDEO_IMX412 is not set
 # CONFIG_VIDEO_IMX415 is not set
 # CONFIG_VIDEO_IPU3_CIO2 is not set
+# CONFIG_VIDEO_ISL7998X is not set
 # CONFIG_VIDEO_IVTV_ALSA is not set
 CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_KS0127 is not set
@@ -7311,6 +7313,7 @@ CONFIG_VIDEO_IVTV=m
 # CONFIG_VIDEO_LM3646 is not set
 # CONFIG_VIDEO_M52790 is not set
 # CONFIG_VIDEO_M5MOLS is not set
+# CONFIG_VIDEO_MAX9286 is not set
 # CONFIG_VIDEO_MEYE is not set
 # CONFIG_VIDEO_ML86V7667 is not set
 # CONFIG_VIDEO_MSP3400 is not set
diff --git a/kernel.spec b/kernel.spec
index cc8f7d602..e563653bf 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -174,13 +174,13 @@ Summary: The Linux kernel
 %define specrpmversion 6.5.0
 %define specversion 6.5.0
 %define patchversion 6.5
-%define pkgrelease 0.rc2.20230719gitccff6d117d8d.18
+%define pkgrelease 0.rc2.20230721gitf7e3a1bafdea.20
 %define kversion 6
-%define tarfile_release 6.5-rc2-46-gccff6d117d8d
+%define tarfile_release 6.5-rc2-221-gf7e3a1bafdea
 # This is needed to do merge window version magic
 %define patchlevel 5
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.20230719gitccff6d117d8d.18%{?buildid}%{?dist}
+%define specrelease 0.rc2.20230721gitf7e3a1bafdea.20%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.5.0
 
@@ -2413,6 +2413,8 @@ BuildKernel() {
     {
         # remove files that will be auto generated by depmod at rpm -i time
         pushd $RPM_BUILD_ROOT/lib/modules/$KernelVer/
+            # in case below list needs to be extended, remember to add a
+            # matching ghost entry in the files section as well
             rm -f modules.{alias,alias.bin,builtin.alias.bin,builtin.bin} \
                   modules.{dep,dep.bin,devname,softdep,symbols,symbols.bin}
         popd
@@ -3283,17 +3285,11 @@ fi\
 
 #
 # This macro defines a %%post script for a kernel*-modules-core package.
-# It also defines a %%postun script that does the same thing.
 #	%%kernel_modules_core_post [<subpackage>]
 #
-# FIXME: /bin/kernel-install can't handle UKIs (yet), so cleanup depmod files in %postun for now.
-#
 %define kernel_modules_core_post() \
 %{expand:%%posttrans %{?1:%{1}-}modules-core}\
 /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\
-%{nil}\
-%{expand:%%postun %{?1:%{1}-}modules-core}\
-rm -f /lib/modules/%{KVERREL}%{?1:+%{1}}/modules.*\
 %{nil}
 
 # This macro defines a %%posttrans script for a kernel package.
@@ -3616,6 +3612,8 @@ fi\
 %endif\
 %attr(0600, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\
 %ghost %attr(0600, root, root) /boot/System.map-%{KVERREL}%{?3:+%{3}}\
+%dir /lib/modules\
+%dir /lib/modules/%{KVERREL}%{?3:+%{3}}\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.%compext\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/config\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.builtin*\
@@ -3623,8 +3621,6 @@ fi\
 %ghost %attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?3:+%{3}}.img\
 %ghost %attr(0644, root, root) /boot/config-%{KVERREL}%{?3:+%{3}}\
 %{expand:%%files -f kernel-%{?3:%{3}-}modules-core.list %{?3:%{3}-}modules-core}\
-%dir /lib/modules\
-%dir /lib/modules/%{KVERREL}%{?3:+%{3}}\
 %dir /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/build\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/source\
@@ -3640,6 +3636,16 @@ fi\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.modesetting\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.networking\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.order\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.alias\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.alias.bin\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.builtin.alias.bin\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.builtin.bin\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.dep\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.dep.bin\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.devname\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.softdep\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.symbols\
+%ghost %attr(0644, root, root) /lib/modules/%{KVERREL}%{?3:+%{3}}/modules.symbols.bin\
 %{expand:%%files -f kernel-%{?3:%{3}-}modules.list %{?3:%{3}-}modules}\
 %{expand:%%files %{?3:%{3}-}devel}\
 %defverify(not mtime)\
@@ -3732,6 +3738,18 @@ fi\
 #
 #
 %changelog
+* Fri Jul 21 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc2.f7e3a1bafdea.20.el127]
+- redhat/configs: disable pre-UVC cameras for RHEL on aarch64 (Dean Nelson)
+- redhat/configs: enable CONFIG_MEDIA_SUPPORT for RHEL on aarch64 (Dean Nelson)
+- Linux v6.5.0-0.rc2.f7e3a1bafdea
+
+* Thu Jul 20 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc2.bfa3037d8280.19.el127]
+- move ownership of /lib/modules/<ver>/ to kernel-core (Thorsten Leemhuis)
+- Let kernel-modules-core own the files depmod generates. (Thorsten Leemhuis)
+- redhat: configs: Enable CONFIG_TYPEC_STUSB160X for rhel on aarch64 (Desnes Nunes)
+- Add filters for ptp_dfl_tod on Fedora (Justin M. Forbes)
+- Linux v6.5.0-0.rc2.bfa3037d8280
+
 * Wed Jul 19 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc2.ccff6d117d8d.18.el127]
 - Fedora 6.5 configs part 1 (Justin M. Forbes)
 - fedora: enable CONFIG_ZYNQMP_IPI_MBOX as a builtin in pending-fedora (Patrick Talbert)
diff --git a/sources b/sources
index 07eeb8615..f2932f333 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.5-rc2-46-gccff6d117d8d.tar.xz) = 7deea7d939cb1fed1dbb207dcc2fa2c233814bf7553066a154cda8f0e12a07574f50e36a98a9e74d1507b40a5fabca16cd19901cdf70b9593d1f78c0db2de0bc
-SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 0f0e011c9822b5307186935ed44b41d3cda597a33d29826ae892d4b75d9319cbbeb3e70ac247c77f61db8d11e5232be98ad5dba3bf94c54eb368ee9c4be10a6c
-SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 3eaaa3c2074b9a6d176ea1264eef894cb921fe14304815876bf2998481df66adb088ce2723359d1188cf9879c0fd3570c8e8437ff0ce791681486841af195bb5
+SHA512 (linux-6.5-rc2-221-gf7e3a1bafdea.tar.xz) = ce8e9b930ba1857dc58a05c4e9ee1215bf011eed053e578d24c5c8ff29725aa497745f7b83d147d5c5d749b4d66460e5bc4f80ce70f63cce3d10de9e7d142450
+SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = cdf302e2619c06934155eed3fad43beabe3da2e6574e6da52ea585795a46e383891469badb9f8f5161b52967f164c2958d50aa40c173b44acedc628ee76f781b
+SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 4828de957c5edd2432b69328ed5a6940a9ca7a96eec7293fa2c1bd015993651a439bd9333a8a665a939e5cc736f8f4fe62df45fc85937c55cd8f1047e0f29c5f