25 files changed, 75 insertions, 87 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 92aed85ff..befbf776d 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 = 21
 
 #
 # ZSTREAM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 5db474977..d9cc6aaee 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -3096,7 +3096,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -8784,6 +8784,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index a0bb13437..a4f245fbb 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1813,7 +1813,7 @@ CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 # CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_FW_LOADER=y
-# CONFIG_FW_UPLOAD is not set
+CONFIG_FW_UPLOAD=y
 # CONFIG_FXAS21002C is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
@@ -6962,6 +6962,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 # CONFIG_XEN_SCSI_FRONTEND is not set
 # CONFIG_XEN_UNPOPULATED_ALLOC is not set
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index bab19dcde..6b19513a6 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -3080,7 +3080,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -8761,6 +8761,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index b077fd0db..2eb2b735e 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1797,7 +1797,7 @@ CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 # CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_FW_LOADER=y
-# CONFIG_FW_UPLOAD is not set
+CONFIG_FW_UPLOAD=y
 # CONFIG_FXAS21002C is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
@@ -6937,6 +6937,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 # CONFIG_XEN_SCSI_FRONTEND is not set
 # CONFIG_XEN_UNPOPULATED_ALLOC is not set
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index f3afc271d..1b5902ca1 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -3117,7 +3117,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -9005,6 +9005,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 493c538c5..4745ef6b2 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -3102,7 +3102,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -8984,6 +8984,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index bd36165e2..3a8f0ee7e 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -3053,7 +3053,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -8747,6 +8747,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 0580445c1..fdc14b331 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -3038,7 +3038,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -8726,6 +8726,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index ab2b36bba..f2562f64e 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -2547,7 +2547,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -7522,6 +7522,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index faebda27e..d10e15585 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1652,7 +1652,7 @@ CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 # CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_FW_LOADER=y
-# CONFIG_FW_UPLOAD is not set
+CONFIG_FW_UPLOAD=y
 # CONFIG_FXAS21002C is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
@@ -6718,6 +6718,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 # CONFIG_XEN_SCSI_FRONTEND is not set
 # CONFIG_XEN_UNPOPULATED_ALLOC is not set
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index f1d3abe7d..02bdcc97b 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -2530,7 +2530,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -7499,6 +7499,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index de42dda21..2591c44a0 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1636,7 +1636,7 @@ CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 # CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_FW_LOADER=y
-# CONFIG_FW_UPLOAD is not set
+CONFIG_FW_UPLOAD=y
 # CONFIG_FXAS21002C is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
@@ -6695,6 +6695,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 # CONFIG_XEN_SCSI_FRONTEND is not set
 # CONFIG_XEN_UNPOPULATED_ALLOC is not set
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 11231cacc..aec09ab93 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -2525,7 +2525,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -7481,6 +7481,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 460e8e149..cf06efa83 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1655,7 +1655,7 @@ CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 # CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_FW_LOADER=y
-# CONFIG_FW_UPLOAD is not set
+CONFIG_FW_UPLOAD=y
 # CONFIG_FXAS21002C is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
@@ -6709,6 +6709,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 # CONFIG_XEN_SCSI_FRONTEND is not set
 # CONFIG_XEN_UNPOPULATED_ALLOC is not set
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 6dc676ef5..652c4ad58 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -2508,7 +2508,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 # CONFIG_INTEL_SOC_PMIC is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_TDX_GUEST is not set
@@ -7458,6 +7458,7 @@ CONFIG_XEN_PRIVCMD=m
 # CONFIG_XEN_PVCALLS_FRONTEND is not set
 CONFIG_XEN_PVHVM_GUEST=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index ce82fcad2..a3b05eec1 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1639,7 +1639,7 @@ CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 # CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_FW_LOADER=y
-# CONFIG_FW_UPLOAD is not set
+CONFIG_FW_UPLOAD=y
 # CONFIG_FXAS21002C is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
@@ -6686,6 +6686,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 # CONFIG_XEN_SCSI_FRONTEND is not set
 # CONFIG_XEN_UNPOPULATED_ALLOC is not set
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index c7b82fc33..3dd14d953 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1646,7 +1646,7 @@ CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 # CONFIG_FW_LOADER_USER_HELPER is not set
 CONFIG_FW_LOADER=y
-# CONFIG_FW_UPLOAD is not set
+CONFIG_FW_UPLOAD=y
 # CONFIG_FXAS21002C is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
@@ -6713,6 +6713,7 @@ CONFIG_XEN_PVHVM=y
 CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 # CONFIG_XEN_SCSI_FRONTEND is not set
 # CONFIG_XEN_UNPOPULATED_ALLOC is not set
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XFRM_INTERFACE=m
 CONFIG_XFRM_MIGRATE=y
 CONFIG_XFRM_OFFLOAD=y
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index f5ead4133..0b5e865a5 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -487,7 +487,10 @@ CONFIG_BATMAN_ADV=m
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_TRACING=y
-# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_BQ27XXX_HDQ is not set
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX=m
 CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
@@ -850,7 +853,7 @@ CONFIG_CHARGER_BQ24190=m
 # CONFIG_CHARGER_BQ24735 is not set
 CONFIG_CHARGER_BQ2515X=m
 CONFIG_CHARGER_BQ256XX=m
-# CONFIG_CHARGER_BQ25890 is not set
+CONFIG_CHARGER_BQ25890=m
 # CONFIG_CHARGER_BQ25980 is not set
 CONFIG_CHARGER_CROS_PCHG=m
 CONFIG_CHARGER_CROS_USBPD=m
@@ -2159,7 +2162,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SIM is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS68470 is not set
+CONFIG_GPIO_TPS68470=m
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_VIPERBOARD is not set
 CONFIG_GPIO_VIRTIO=m
@@ -2796,7 +2799,7 @@ CONFIG_INTEL_SKL_INT3472=m
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INTEL_SOC_PMIC_BXTWC=m
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 CONFIG_INTEL_SOC_PMIC_CHTWC=y
 CONFIG_INTEL_SOC_PMIC_MRFLD=m
 CONFIG_INTEL_SOC_PMIC=y
@@ -3766,7 +3769,7 @@ CONFIG_MLX_WDT=m
 # CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA7455_SPI is not set
 CONFIG_MMA7660=m
-# CONFIG_MMA8452 is not set
+CONFIG_MMA8452=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
@@ -7666,7 +7669,7 @@ CONFIG_VIDEO_IMX335=m
 CONFIG_VIDEO_IMX355=m
 CONFIG_VIDEO_IMX412=m
 CONFIG_VIDEO_IPU3_CIO2=m
-# CONFIG_VIDEO_IPU3_IMGU is not set
+CONFIG_VIDEO_IPU3_IMGU=m
 # CONFIG_VIDEO_IVTV_ALSA is not set
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
@@ -7927,7 +7930,7 @@ CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 CONFIG_X86_AMD_PLATFORM_DEVICE=y
 CONFIG_X86_AMD_PSTATE=y
-# CONFIG_X86_ANDROID_TABLETS is not set
+CONFIG_X86_ANDROID_TABLETS=m
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_CPA_STATISTICS=y
@@ -8014,6 +8017,7 @@ CONFIG_XEN_SCSI_FRONTEND=m
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XEN_WDT=m
 CONFIG_XEN=y
 CONFIG_XFRM_INTERFACE=m
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 1db7d2a67..9c633d5a7 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1759,7 +1759,7 @@ CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_FW_LOADER_USER_HELPER=y
 CONFIG_FW_LOADER=y
-# CONFIG_FW_UPLOAD is not set
+CONFIG_FW_UPLOAD=y
 # CONFIG_FXAS21002C is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
@@ -7017,6 +7017,7 @@ CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 # CONFIG_XEN_SCSI_FRONTEND is not set
 CONFIG_XEN_SYS_HYPERVISOR=y
 # CONFIG_XEN_UNPOPULATED_ALLOC is not set
+# CONFIG_XEN_VIRTIO is not set
 # CONFIG_XEN_WDT is not set
 CONFIG_XEN=y
 CONFIG_XFRM_INTERFACE=m
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 17f7dcd58..2f3437849 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -486,7 +486,10 @@ CONFIG_BATMAN_ADV=m
 CONFIG_BATMAN_ADV_MCAST=y
 CONFIG_BATMAN_ADV_NC=y
 CONFIG_BATMAN_ADV_TRACING=y
-# CONFIG_BATTERY_BQ27XXX is not set
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+# CONFIG_BATTERY_BQ27XXX_HDQ is not set
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX=m
 CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2760 is not set
 # CONFIG_BATTERY_DS2780 is not set
@@ -849,7 +852,7 @@ CONFIG_CHARGER_BQ24190=m
 # CONFIG_CHARGER_BQ24735 is not set
 CONFIG_CHARGER_BQ2515X=m
 CONFIG_CHARGER_BQ256XX=m
-# CONFIG_CHARGER_BQ25890 is not set
+CONFIG_CHARGER_BQ25890=m
 # CONFIG_CHARGER_BQ25980 is not set
 CONFIG_CHARGER_CROS_PCHG=m
 CONFIG_CHARGER_CROS_USBPD=m
@@ -2142,7 +2145,7 @@ CONFIG_GPIO_PCI_IDIO_16=m
 # CONFIG_GPIO_SIM is not set
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS68470 is not set
+CONFIG_GPIO_TPS68470=m
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_VIPERBOARD is not set
 CONFIG_GPIO_VIRTIO=m
@@ -2779,7 +2782,7 @@ CONFIG_INTEL_SKL_INT3472=m
 CONFIG_INTEL_SMARTCONNECT=y
 CONFIG_INTEL_SOC_DTS_THERMAL=m
 CONFIG_INTEL_SOC_PMIC_BXTWC=m
-CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=y
 CONFIG_INTEL_SOC_PMIC_CHTWC=y
 CONFIG_INTEL_SOC_PMIC_MRFLD=m
 CONFIG_INTEL_SOC_PMIC=y
@@ -3747,7 +3750,7 @@ CONFIG_MLX_WDT=m
 # CONFIG_MMA7455_I2C is not set
 # CONFIG_MMA7455_SPI is not set
 CONFIG_MMA7660=m
-# CONFIG_MMA8452 is not set
+CONFIG_MMA8452=m
 # CONFIG_MMA9551 is not set
 # CONFIG_MMA9553 is not set
 # CONFIG_MMC35240 is not set
@@ -7644,7 +7647,7 @@ CONFIG_VIDEO_IMX335=m
 CONFIG_VIDEO_IMX355=m
 CONFIG_VIDEO_IMX412=m
 CONFIG_VIDEO_IPU3_CIO2=m
-# CONFIG_VIDEO_IPU3_IMGU is not set
+CONFIG_VIDEO_IPU3_IMGU=m
 # CONFIG_VIDEO_IVTV_ALSA is not set
 CONFIG_VIDEO_IVTV=m
 CONFIG_VIDEO_LM3560=m
@@ -7905,7 +7908,7 @@ CONFIG_X86_ACPI_CPUFREQ=m
 CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 CONFIG_X86_AMD_PLATFORM_DEVICE=y
 CONFIG_X86_AMD_PSTATE=y
-# CONFIG_X86_ANDROID_TABLETS is not set
+CONFIG_X86_ANDROID_TABLETS=m
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
 CONFIG_X86_CHECK_BIOS_CORRUPTION=y
 CONFIG_X86_CPA_STATISTICS=y
@@ -7992,6 +7995,7 @@ CONFIG_XEN_SCSI_FRONTEND=m
 CONFIG_XEN_SYMS=y
 CONFIG_XEN_SYS_HYPERVISOR=y
 CONFIG_XEN_UNPOPULATED_ALLOC=y
+# CONFIG_XEN_VIRTIO is not set
 CONFIG_XEN_WDT=m
 CONFIG_XEN=y
 CONFIG_XFRM_INTERFACE=m
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 02dcf12a6..7e5ce0b34 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1743,7 +1743,7 @@ CONFIG_FW_LOADER_COMPRESS=y
 # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
 CONFIG_FW_LOADER_USER_HELPER=y
 CONFIG_FW_LOADER=y
-# CONFIG_FW_UPLOAD is not set
+CONFIG_FW_UPLOAD=y
 # CONFIG_FXAS21002C is not set
 # CONFIG_FXLS8962AF_I2C is not set
 # CONFIG_FXLS8962AF_SPI is not set
@@ -6993,6 +6993,7 @@ CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
 # CONFIG_XEN_SCSI_FRONTEND is not set
 CONFIG_XEN_SYS_HYPERVISOR=y
 # CONFIG_XEN_UNPOPULATED_ALLOC is not set
+# CONFIG_XEN_VIRTIO is not set
 # CONFIG_XEN_WDT is not set
 CONFIG_XEN=y
 CONFIG_XFRM_INTERFACE=m
diff --git a/kernel.spec b/kernel.spec
index dbb8179d8..c37b871e5 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -120,17 +120,17 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1
 # define buildid .local
 %define specversion 5.19.0
 %define patchversion 5.19
-%define pkgrelease 0.rc1.20220610git874c8ca1e60b.18
+%define pkgrelease 0.rc2.21
 %define kversion 5
-%define tarfile_release 5.19-rc1-95-g874c8ca1e60b
+%define tarfile_release 5.19-rc2
 # This is needed to do merge window version magic
 %define patchlevel 19
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20220610git874c8ca1e60b.18%{?buildid}%{?dist}
+%define specrelease 0.rc2.21%{?buildid}%{?dist}
 
 #
 # End of genspec.sh variables
@@ -3040,6 +3040,11 @@ fi
 #
 #
 %changelog
+* Sun Jun 12 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc1.7a68065eb9cd.19]
+- redhat/configs/fedora: Enable a set of modules used on some x86 tablets (Hans de Goede)
+- redhat/configs: Make INTEL_SOC_PMIC_CHTDC_TI builtin (Hans de Goede)
+- redhat/configs/fedora: enable missing modules modules for Intel IPU3 camera support (Hans de Goede)
+
 * Fri Jun 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc1.874c8ca1e60b.17]
 - Common: minor cleanups (Peter Robinson)
 - fedora: some minor Fedora cleanups (Peter Robinson)
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch
index 4028e8adc..97e1b74f0 100644
--- a/patch-5.19-redhat.patch
+++ b/patch-5.19-redhat.patch
@@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index b2e93c1a8021..402c2814a782 100644
+index 1a6678d817bd..26554fa9689d 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -2551,7 +2551,7 @@ index c7900e8975f1..ea721c12c251 100644
  	default y
  	help
 diff --git a/kernel/Makefile b/kernel/Makefile
-index 318789c728d3..148911cf65da 100644
+index a7e1f49ab2b3..4a9172cf1728 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
 @@ -12,6 +12,7 @@ obj-y     = fork.o exec_domain.o panic.o \
@@ -3016,47 +3016,3 @@ index 188b8f782220..dab400de2335 100644
  #ifdef CONFIG_PERF_EVENTS
  int security_perf_event_open(struct perf_event_attr *attr, int type)
  {
-From 228432551bd8783211e494ab35f42a4344580502 Mon Sep 17 00:00:00 2001
-From: Jason Wang <jasowang@redhat.com>
-Date: Wed, 8 Jun 2022 14:14:22 +0800
-Subject: [PATCH] virtio-rng: make device ready before making request
-
-Current virtio-rng does a entropy request before DRIVER_OK, this
-violates the spec:
-
-virtio spec requires that all drivers set DRIVER_OK
-before using devices.
-
-Further, kernel will ignore the interrupt after commit
-8b4ec69d7e09 ("virtio: harden vring IRQ").
-
-Fixing this by making device ready before the request.
-
-Cc: stable@vger.kernel.org
-Fixes: 8b4ec69d7e09 ("virtio: harden vring IRQ")
-Fixes: f7f510ec1957 ("virtio: An entropy device, as suggested by hpa.")
-Reported-and-tested-by: syzbot+5b59d6d459306a556f54@syzkaller.appspotmail.com
-Signed-off-by: Jason Wang <jasowang@redhat.com>
-Message-Id: <20220608061422.38437-1-jasowang@redhat.com>
-Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-Reviewed-by: Laurent Vivier <lvivier@redhat.com>
----
- drivers/char/hw_random/virtio-rng.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c
-index e856df7e285c..a6f3a8a2aca6 100644
---- a/drivers/char/hw_random/virtio-rng.c
-+++ b/drivers/char/hw_random/virtio-rng.c
-@@ -159,6 +159,8 @@ static int probe_common(struct virtio_device *vdev)
- 		goto err_find;
- 	}
-
-+	virtio_device_ready(vdev);
-+
- 	/* we always have a pending entropy request */
- 	request_entropy(vi);
-
--- 
-2.36.1
-
diff --git a/sources b/sources
index 9e07c2ca0..430d88021 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.19-rc1-95-g874c8ca1e60b.tar.xz) = 431faba7680696d0d42d49c283e24166526077dd0a20465b9dc8ec1ebc070acc34ae98ace7fb15cd746f7d42e7402cbb6116a08d077ede10dc7c2ed3c134e4d2
-SHA512 (kernel-abi-stablelists-5.19.0-0.rc1.20220610git874c8ca1e60b.18.tar.bz2) = 24288c5eab11826a79e51ff72e32ea3b40f39e73c80c3b8f7d97c3aba2f63fe28b394081838052e03fab8fd506eda49be49e94bbd7ac02ac41c5e80f47f8291c
-SHA512 (kernel-kabi-dw-5.19.0-0.rc1.20220610git874c8ca1e60b.18.tar.bz2) = 0929e3d0aebcce32c030bbd493fee3da6404265afb95a913be7c990abb6f62733613a4db4ca44e9aab69b31eb20cd9a8e577e336afc14bcb648cc77e156ad263
+SHA512 (linux-5.19-rc2.tar.xz) = a9820eb76451f92b13e811719b0d63e86d9b868db51d648b20c065a7b3bd7d273c6f11316178e602d9fc64d9394eebebdf67ac05b0814113e3ed99bdd9e6adf6
+SHA512 (kernel-abi-stablelists-5.19.0-0.rc2.21.tar.bz2) = 37621518bf26c93ef6b49158edce123da96c299a6c672d61f4edd7a3a6ba6acb835f1085b03a70fc3fd8e2f0f58e0cec1f3973574fc1ea43f5d22e048549a4db
+SHA512 (kernel-kabi-dw-5.19.0-0.rc2.21.tar.bz2) = 91dad1f8957c2dda756421b1f62bd34aec602039e9cd429dccbee1f6c5a30e519241aee2636ee7aeaf136a7940cce3f5011d5f7b9b9a0d5b65c0196e3d77913e