From b20cde7f13c5e02015cd2636e5f157aaf264f1ce Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Wed, 19 Jul 2023 07:38:28 -0500
Subject: [PATCH] kernel-6.5.0-0.rc2.20230719gitccff6d117d8d.18

* 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)
- fedora: arm: some minor updates (Peter Robinson)
- fedora: bluetooth: enable AOSP extensions (Peter Robinson)
- Linux v6.5.0-0.rc2.ccff6d117d8d
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Makefile.rhelver                        |  2 +-
 filter-aarch64.sh.fedora                |  2 +-
 filter-ppc64le.sh.fedora                |  2 +-
 kernel-aarch64-debug-fedora.config      | 21 +++++++--------------
 kernel-aarch64-fedora.config            | 21 +++++++--------------
 kernel-armv7hl-debug-fedora.config      | 19 ++++++-------------
 kernel-armv7hl-fedora.config            | 19 ++++++-------------
 kernel-armv7hl-lpae-debug-fedora.config | 19 ++++++-------------
 kernel-armv7hl-lpae-fedora.config       | 19 ++++++-------------
 kernel-ppc64le-debug-fedora.config      | 17 +++++------------
 kernel-ppc64le-fedora.config            | 17 +++++------------
 kernel-s390x-debug-fedora.config        | 17 +++++------------
 kernel-s390x-fedora.config              | 17 +++++------------
 kernel-x86_64-debug-fedora.config       | 13 +++----------
 kernel-x86_64-fedora.config             | 13 +++----------
 kernel.spec                             | 11 +++++++----
 sources                                 |  6 +++---
 17 files changed, 77 insertions(+), 158 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index cb2beaa85..7db7c7804 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 = 17
+RHEL_RELEASE = 18
 
 #
 # RHEL_REBASE_NUM
diff --git a/filter-aarch64.sh.fedora b/filter-aarch64.sh.fedora
index 75a32f05f..f1f941acf 100644
--- a/filter-aarch64.sh.fedora
+++ b/filter-aarch64.sh.fedora
@@ -15,4 +15,4 @@ ethdrvs="3com adaptec arc alteon atheros broadcom cadence calxeda chelsio cisco
 
 drmdrvs="amd arm bridge ast exynos hisilicon i2c imx mgag200 meson msm nouveau panel pl111 radeon rockchip tegra sun4i tiny vc4"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq hid-playstation hid-nintendo nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa dfl-emif octeontx2-cpt octeontx2-cptvf spi-altera-dfl rvu_cptpf rvu_cptvf regmap-sdw regmap-sdw-mbq hid-playstation hid-nintendo nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod"
diff --git a/filter-ppc64le.sh.fedora b/filter-ppc64le.sh.fedora
index 60e46859c..74d8073cc 100644
--- a/filter-ppc64le.sh.fedora
+++ b/filter-ppc64le.sh.fedora
@@ -11,4 +11,4 @@
 
 driverdirs="atm auxdisplay bcma bluetooth firewire fpga infiniband leds media memstick message mmc mtd nfc ntb pcmcia platform power ssb staging tty uio w1"
 
-singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa hid-playstation hid-nintendo mlx5-vfio-pci nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon"
+singlemods="ntb_netdev iscsi_ibft iscsi_boot_sysfs megaraid pmcraid qedi qla1280 9pnet_rdma rpcrdma nvmet-rdma nvme-rdma hid-picolcd hid-prodikeys hwpoison-inject target_core_user sbp_target cxgbit chcr rnbd-client rnbd-server mlx5_vdpa hid-playstation hid-nintendo mlx5-vfio-pci nvmem_u-boot-env intel-m10-bmc-pmci intel-m10-bmc-hwmon ptp_dfl_tod"
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 175c1dd5a..26ffe4ef3 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -891,7 +891,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1969,7 +1969,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
@@ -2003,7 +2003,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7703=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -5304,7 +5304,7 @@ CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
-CONFIG_NVMEM_ZYNQMP=y
+CONFIG_NVMEM_ZYNQMP=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_TARGET_AUTH=y
 CONFIG_NVME_TARGET_FCLOOP=m
@@ -5912,7 +5912,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 CONFIG_PVPANIC_PCI=m
 CONFIG_PVPANIC=y
@@ -7877,7 +7877,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7902,7 +7902,7 @@ CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m
 # CONFIG_SPI_ALTERA is not set
 CONFIG_SPI_AMD=y
-# CONFIG_SPI_AMLOGIC_SPIFC_A1 is not set
+CONFIG_SPI_AMLOGIC_SPIFC_A1=m
 CONFIG_SPI_ARMADA_3700=m
 CONFIG_SPI_AX88796C_COMPRESSION=y
 CONFIG_SPI_AX88796C=m
@@ -9123,23 +9123,19 @@ CONFIG_VIDEO_IMX_PXP=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_GE2D=m
 CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -9190,7 +9186,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
@@ -9201,7 +9196,6 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -9238,7 +9232,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index d6a90c2f3..0af5eeca1 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -891,7 +891,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1960,7 +1960,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
@@ -1994,7 +1994,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7703=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -5278,7 +5278,7 @@ CONFIG_NVMEM_SYSFS=y
 CONFIG_NVMEM_U_BOOT_ENV=m
 CONFIG_NVME_MULTIPATH=y
 CONFIG_NVMEM=y
-CONFIG_NVMEM_ZYNQMP=y
+CONFIG_NVMEM_ZYNQMP=m
 CONFIG_NVME_RDMA=m
 CONFIG_NVME_TARGET_AUTH=y
 CONFIG_NVME_TARGET_FCLOOP=m
@@ -5885,7 +5885,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK_QORIQ=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 CONFIG_PVPANIC_PCI=m
 CONFIG_PVPANIC=y
@@ -7848,7 +7848,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7873,7 +7873,7 @@ CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m
 # CONFIG_SPI_ALTERA is not set
 CONFIG_SPI_AMD=y
-# CONFIG_SPI_AMLOGIC_SPIFC_A1 is not set
+CONFIG_SPI_AMLOGIC_SPIFC_A1=m
 CONFIG_SPI_ARMADA_3700=m
 CONFIG_SPI_AX88796C_COMPRESSION=y
 CONFIG_SPI_AX88796C=m
@@ -9094,23 +9094,19 @@ CONFIG_VIDEO_IMX_PXP=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_GE2D=m
 CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -9161,7 +9157,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
@@ -9172,7 +9167,6 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -9209,7 +9203,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index b64a68193..cc915bb94 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -885,7 +885,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1946,7 +1946,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
@@ -1980,7 +1980,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7703=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -5865,7 +5865,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
 CONFIG_PVPANIC=y
@@ -7883,7 +7883,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7906,7 +7906,7 @@ CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m
 # CONFIG_SPI_ALTERA is not set
 CONFIG_SPI_AMD=y
-# CONFIG_SPI_AMLOGIC_SPIFC_A1 is not set
+CONFIG_SPI_AMLOGIC_SPIFC_A1=m
 CONFIG_SPI_ARMADA_3700=m
 CONFIG_SPI_AX88796C_COMPRESSION=y
 CONFIG_SPI_AX88796C=m
@@ -9152,24 +9152,20 @@ CONFIG_VIDEO_IMX_VDOA=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_GE2D=m
 CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MMP_CAMERA=m
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
 CONFIG_VIDEO_OMAP3=m
@@ -9222,7 +9218,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
 CONFIG_VIDEO_SAA6588=m
@@ -9240,7 +9235,6 @@ CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STI_BDISP=m
 CONFIG_VIDEO_STI_DELTA_DRIVER=m
 CONFIG_VIDEO_STI_DELTA=m
@@ -9286,7 +9280,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 6a9f9373f..8e02a8d0d 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -885,7 +885,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1938,7 +1938,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
@@ -1972,7 +1972,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7703=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -5840,7 +5840,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
 CONFIG_PVPANIC=y
@@ -7856,7 +7856,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7879,7 +7879,7 @@ CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m
 # CONFIG_SPI_ALTERA is not set
 CONFIG_SPI_AMD=y
-# CONFIG_SPI_AMLOGIC_SPIFC_A1 is not set
+CONFIG_SPI_AMLOGIC_SPIFC_A1=m
 CONFIG_SPI_ARMADA_3700=m
 CONFIG_SPI_AX88796C_COMPRESSION=y
 CONFIG_SPI_AX88796C=m
@@ -9125,24 +9125,20 @@ CONFIG_VIDEO_IMX_VDOA=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_GE2D=m
 CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MMP_CAMERA=m
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OMAP3_DEBUG is not set
 CONFIG_VIDEO_OMAP3=m
@@ -9195,7 +9191,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
 CONFIG_VIDEO_SAA6588=m
@@ -9213,7 +9208,6 @@ CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STI_BDISP=m
 CONFIG_VIDEO_STI_DELTA_DRIVER=m
 CONFIG_VIDEO_STI_DELTA=m
@@ -9259,7 +9253,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 24fe9e791..0771f80ce 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -864,7 +864,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1903,7 +1903,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
@@ -1937,7 +1937,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7703=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -5738,7 +5738,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
 CONFIG_PVPANIC=y
@@ -7665,7 +7665,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7688,7 +7688,7 @@ CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m
 # CONFIG_SPI_ALTERA is not set
 CONFIG_SPI_AMD=y
-# CONFIG_SPI_AMLOGIC_SPIFC_A1 is not set
+CONFIG_SPI_AMLOGIC_SPIFC_A1=m
 CONFIG_SPI_ARMADA_3700=m
 CONFIG_SPI_AX88796C_COMPRESSION=y
 CONFIG_SPI_AX88796C=m
@@ -8915,23 +8915,19 @@ CONFIG_VIDEO_IMX_PXP=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_GE2D=m
 CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -8980,7 +8976,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
 CONFIG_VIDEO_SAA6588=m
@@ -8998,7 +8993,6 @@ CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -9038,7 +9032,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index b27069798..156fc4079 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -864,7 +864,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1895,7 +1895,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO=m
@@ -1929,7 +1929,7 @@ CONFIG_DRM_PANEL_SITRONIX_ST7701=m
 CONFIG_DRM_PANEL_SITRONIX_ST7703=m
 CONFIG_DRM_PANEL_SITRONIX_ST7789V=m
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -5713,7 +5713,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
 CONFIG_PVPANIC=y
@@ -7638,7 +7638,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7661,7 +7661,7 @@ CONFIG_SPI_ALTERA_CORE=m
 CONFIG_SPI_ALTERA_DFL=m
 # CONFIG_SPI_ALTERA is not set
 CONFIG_SPI_AMD=y
-# CONFIG_SPI_AMLOGIC_SPIFC_A1 is not set
+CONFIG_SPI_AMLOGIC_SPIFC_A1=m
 CONFIG_SPI_ARMADA_3700=m
 CONFIG_SPI_AX88796C_COMPRESSION=y
 CONFIG_SPI_AX88796C=m
@@ -8888,23 +8888,19 @@ CONFIG_VIDEO_IMX_PXP=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MESON_GE2D=m
 CONFIG_VIDEO_MESON_VDEC=m
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MUX=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -8953,7 +8949,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_S5P_FIMC=m
 CONFIG_VIDEO_S5P_MIPI_CSIS=m
 CONFIG_VIDEO_SAA6588=m
@@ -8971,7 +8966,6 @@ CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -9011,7 +9005,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index c35ef33da..a4d32c4d0 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -646,7 +646,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1499,7 +1499,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -1533,7 +1533,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -4943,7 +4943,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
 CONFIG_PVPANIC=y
@@ -6616,7 +6616,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7638,20 +7638,16 @@ CONFIG_VIDEO_IMX415=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -7698,7 +7694,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
@@ -7709,7 +7704,6 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -7733,7 +7727,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index af3f48d0a..dbf7ac42f 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -644,7 +644,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1488,7 +1488,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -1522,7 +1522,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -4914,7 +4914,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
 CONFIG_PVPANIC=y
@@ -6585,7 +6585,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7607,20 +7607,16 @@ CONFIG_VIDEO_IMX415=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -7667,7 +7663,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
@@ -7678,7 +7673,6 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -7702,7 +7696,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 36032cc4a..cbf7dcdbf 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -648,7 +648,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1504,7 +1504,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -1538,7 +1538,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -4867,7 +4867,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
 CONFIG_PVPANIC=y
@@ -6555,7 +6555,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 # CONFIG_SOUND is not set
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7586,20 +7586,16 @@ CONFIG_VIDEO_IMX415=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -7646,7 +7642,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
@@ -7657,7 +7652,6 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -7681,7 +7675,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index fc73fd33e..7a2c2c272 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -646,7 +646,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1493,7 +1493,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -1527,7 +1527,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -4838,7 +4838,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
 # CONFIG_PTP_1588_CLOCK_OCP is not set
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PTP_1588_CLOCK=y
-# CONFIG_PTP_DFL_TOD is not set
+CONFIG_PTP_DFL_TOD=m
 # CONFIG_PVPANIC_MMIO is not set
 # CONFIG_PVPANIC_PCI is not set
 CONFIG_PVPANIC=y
@@ -6524,7 +6524,7 @@ CONFIG_SONY_FF=y
 # CONFIG_SONYPI is not set
 # CONFIG_SOUND is not set
 CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SOUNDWIRE_AMD=m
+# CONFIG_SOUNDWIRE_AMD is not set
 # CONFIG_SOUNDWIRE_CADENCE is not set
 CONFIG_SOUNDWIRE_GENERIC_ALLOCATION=m
 # CONFIG_SOUNDWIRE_INTEL is not set
@@ -7555,20 +7555,16 @@ CONFIG_VIDEO_IMX415=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -7615,7 +7611,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
@@ -7626,7 +7621,6 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -7650,7 +7644,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 5451dbc47..6d07c4687 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -700,7 +700,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1636,7 +1636,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -1670,7 +1670,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -8070,20 +8070,16 @@ CONFIG_VIDEO_IPU3_IMGU=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -8130,7 +8126,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
@@ -8141,7 +8136,6 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -8165,7 +8159,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 48864967e..08c071a6a 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -698,7 +698,7 @@ CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BT_6LOWPAN=m
-# CONFIG_BT_AOSPEXT is not set
+CONFIG_BT_AOSPEXT=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
 CONFIG_BT_BNEP_MC_FILTER=y
@@ -1625,7 +1625,7 @@ CONFIG_DRM_PANEL_NEWVISION_NV3051D=m
 CONFIG_DRM_PANEL_NOVATEK_NT35510=m
 CONFIG_DRM_PANEL_NOVATEK_NT35560=m
 CONFIG_DRM_PANEL_NOVATEK_NT35950=m
-CONFIG_DRM_PANEL_NOVATEK_NT36523=m
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT36672A is not set
 # CONFIG_DRM_PANEL_NOVATEK_NT39016 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@@ -1659,7 +1659,7 @@ CONFIG_DRM_PANEL_SEIKO_43WVF1G=m
 # CONFIG_DRM_PANEL_SITRONIX_ST7703 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 # CONFIG_DRM_PANEL_SONY_ACX565AKM is not set
-CONFIG_DRM_PANEL_SONY_TD4353_JDI=m
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
 CONFIG_DRM_PANEL_SONY_TULIP_TRULY_NT35521=m
 # CONFIG_DRM_PANEL_TDO_TL070WSH30 is not set
 # CONFIG_DRM_PANEL_TPO_TD028TTEC1 is not set
@@ -8040,20 +8040,16 @@ CONFIG_VIDEO_IPU3_IMGU=m
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
 CONFIG_VIDEO_LM3646=m
-CONFIG_VIDEO_M5MOLS=m
 # CONFIG_VIDEO_MAX96712 is not set
 # CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 CONFIG_VIDEO_MT9M001=m
-CONFIG_VIDEO_MT9M032=m
 # CONFIG_VIDEO_MT9M111 is not set
 CONFIG_VIDEO_MT9P031=m
-CONFIG_VIDEO_MT9T001=m
 CONFIG_VIDEO_MT9T112=m
 CONFIG_VIDEO_MT9V011=m
 CONFIG_VIDEO_MT9V032=m
 CONFIG_VIDEO_MT9V111=m
 CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_NOON010PC30=m
 CONFIG_VIDEO_OG01A1B=m
 # CONFIG_VIDEO_OV01A10 is not set
 CONFIG_VIDEO_OV02A10=m
@@ -8100,7 +8096,6 @@ CONFIG_VIDEO_S5C73M3=m
 CONFIG_VIDEO_S5K4ECGX=m
 CONFIG_VIDEO_S5K5BAF=m
 CONFIG_VIDEO_S5K6A3=m
-CONFIG_VIDEO_S5K6AA=m
 CONFIG_VIDEO_SAA6588=m
 CONFIG_VIDEO_SAA7134_ALSA=m
 CONFIG_VIDEO_SAA7134_DVB=m
@@ -8111,7 +8106,6 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SOLO6X10=m
-CONFIG_VIDEO_SR030PC30=m
 CONFIG_VIDEO_STK1160_COMMON=m
 CONFIG_VIDEO_STK1160=m
 # CONFIG_VIDEO_STKWEBCAM is not set
@@ -8135,7 +8129,6 @@ CONFIG_VIDEO_VISL=m
 CONFIG_VIDEO_VIVID_CEC=y
 CONFIG_VIDEO_VIVID=m
 CONFIG_VIDEO_VIVID_MAX_DEVS=64
-CONFIG_VIDEO_VS6624=m
 # CONFIG_VIDEO_XILINX is not set
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIPERBOARD_ADC is not set
diff --git a/kernel.spec b/kernel.spec
index cd4d43a4c..cc8f7d602 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.17
+%define pkgrelease 0.rc2.20230719gitccff6d117d8d.18
 %define kversion 6
-%define tarfile_release 6.5-rc2
+%define tarfile_release 6.5-rc2-46-gccff6d117d8d
 # 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.17%{?buildid}%{?dist}
+%define specrelease 0.rc2.20230719gitccff6d117d8d.18%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.5.0
 
@@ -3732,9 +3732,12 @@ fi\
 #
 #
 %changelog
-* Tue Jul 18 2023 Justin M. Forbes <jforbes@fedoraproject.org> [6.5.0-0.rc2.17]
+* 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)
+- fedora: arm: some minor updates (Peter Robinson)
+- fedora: bluetooth: enable AOSP extensions (Peter Robinson)
+- Linux v6.5.0-0.rc2.ccff6d117d8d
 
 * Mon Jul 17 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.5.0-0.rc2.17.el127]
 - Linux v6.5.0-0.rc2
diff --git a/sources b/sources
index 5576f2364..07eeb8615 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-6.5-rc2.tar.xz) = 0988f0ee96a48196e77c2cd4178e8836661c2996688cf813abd40b07f63c034cbff43e8cfbe6165cf5f6154697743ab02c47da8a450993f02fdb734dff73e7ce
-SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = b6a222625e9a994b22980e8eb38a6dbd1895dd9a96debcd54f53cf1b60541303b2130ca1c18f09b1b9ecd08b7c6c30f880465ec7f878c9095739d4fdba399bbd
-SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = f985abde231fcddd9cb8ce3b6a99b775e0d62448dd8e99414413d195779541d5e9e67832fb25b41baaf9a6ac2aa8ca580e8b1d597a363a2fb0f990b67b31381d
+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