kernel-6.9.0-7.el10

* Mon May 20 2024 Jan Stancek <jstancek@redhat.com> [6.9.0-7.el10] - v6.9-rt5 (Sebastian Andrzej Siewior) - configs: move CONFIG_BLK_DEV_UBLK into rhel/configs/generic (Ming Lei) - configs: move CONFIG_BLK_SED_OPAL into redhat/configs/common/generic (Ming Lei) - RHEL-21097: rhel: aarch64 stop blocking a number of HW sensors (Peter Robinson) - redhat/configs: enable RTL8822BU for rhel (Jose Ignacio Tornos Martinez) - redhat/configs: remove CONFIG_DMA_PERNUMA_CMA and switch CONFIG_DMA_NUMA_CMA off (Jerry Snitselaar) - redhat: add IMA certificates (Jan Stancek) - redhat/kernel.spec: fix typo in move_kmod_list() variable (Jan Stancek) Resolves: RHEL-29722 Signed-off-by: Jan Stancek <jstancek@redhat.com>
2024-05-20 13:51:56 +02:00 · 2024-05-20 13:51:56 +02:00 · 6afad7b0a4
commit 6afad7b0a4
parent 1f545e5d8e
22 changed files with 1924 additions and 1875 deletions
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@ -12,7 +12,7 @@ RHEL_MINOR = 0
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 6
+RHEL_RELEASE = 7

 #
 # RHEL_REBASE_NUM
--- a/kernel-aarch64-64k-debug-rhel.config
+++ b/kernel-aarch64-64k-debug-rhel.config
@ -615,12 +615,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1452,8 +1453,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5520,7 +5520,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
@ -5780,7 +5780,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_EMC2305 is not set
 # CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
+CONFIG_SENSORS_F71882FG=m
 # CONFIG_SENSORS_F75375S is not set
 CONFIG_SENSORS_FSCHMD=m
 # CONFIG_SENSORS_FSP_3Y is not set
@ -5790,7 +5790,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
@ -5803,7 +5803,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA238 is not set
-# CONFIG_SENSORS_INA2XX is not set
+CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
 # CONFIG_SENSORS_INSPUR_IPSPS is not set
 CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
@ -5823,17 +5823,17 @@ CONFIG_SENSORS_K8TEMP=m
 # CONFIG_SENSORS_LM25066 is not set
 # CONFIG_SENSORS_LM63 is not set
 CONFIG_SENSORS_LM70=m
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
 # CONFIG_SENSORS_LM80 is not set
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
 # CONFIG_SENSORS_LM95234 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_LM95245 is not set
@ -5939,11 +5939,11 @@ CONFIG_SENSORS_SMPRO=m
 CONFIG_SENSORS_TC74=m
 # CONFIG_SENSORS_TDA38640 is not set
 # CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
+CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
 # CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
 # CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_TPS23861 is not set
--- a/kernel-aarch64-64k-rhel.config
+++ b/kernel-aarch64-64k-rhel.config
@ -615,12 +615,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1444,8 +1445,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5497,7 +5497,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
@ -5757,7 +5757,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_EMC2305 is not set
 # CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
+CONFIG_SENSORS_F71882FG=m
 # CONFIG_SENSORS_F75375S is not set
 CONFIG_SENSORS_FSCHMD=m
 # CONFIG_SENSORS_FSP_3Y is not set
@ -5767,7 +5767,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
@ -5780,7 +5780,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA238 is not set
-# CONFIG_SENSORS_INA2XX is not set
+CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
 # CONFIG_SENSORS_INSPUR_IPSPS is not set
 CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
@ -5800,17 +5800,17 @@ CONFIG_SENSORS_K8TEMP=m
 # CONFIG_SENSORS_LM25066 is not set
 # CONFIG_SENSORS_LM63 is not set
 CONFIG_SENSORS_LM70=m
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
 # CONFIG_SENSORS_LM80 is not set
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
 # CONFIG_SENSORS_LM95234 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_LM95245 is not set
@ -5916,11 +5916,11 @@ CONFIG_SENSORS_SMPRO=m
 CONFIG_SENSORS_TC74=m
 # CONFIG_SENSORS_TDA38640 is not set
 # CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
+CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
 # CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
 # CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_TPS23861 is not set
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -613,12 +613,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1450,8 +1451,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5516,7 +5516,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
@ -5776,7 +5776,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_EMC2305 is not set
 # CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
+CONFIG_SENSORS_F71882FG=m
 # CONFIG_SENSORS_F75375S is not set
 CONFIG_SENSORS_FSCHMD=m
 # CONFIG_SENSORS_FSP_3Y is not set
@ -5786,7 +5786,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
@ -5799,7 +5799,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA238 is not set
-# CONFIG_SENSORS_INA2XX is not set
+CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
 # CONFIG_SENSORS_INSPUR_IPSPS is not set
 CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
@ -5819,17 +5819,17 @@ CONFIG_SENSORS_K8TEMP=m
 # CONFIG_SENSORS_LM25066 is not set
 # CONFIG_SENSORS_LM63 is not set
 CONFIG_SENSORS_LM70=m
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
 # CONFIG_SENSORS_LM80 is not set
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
 # CONFIG_SENSORS_LM95234 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_LM95245 is not set
@ -5935,11 +5935,11 @@ CONFIG_SENSORS_SMPRO=m
 CONFIG_SENSORS_TC74=m
 # CONFIG_SENSORS_TDA38640 is not set
 # CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
+CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
 # CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
 # CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_TPS23861 is not set
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -613,12 +613,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1442,8 +1443,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5493,7 +5493,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
@ -5753,7 +5753,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_EMC2305 is not set
 # CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
+CONFIG_SENSORS_F71882FG=m
 # CONFIG_SENSORS_F75375S is not set
 CONFIG_SENSORS_FSCHMD=m
 # CONFIG_SENSORS_FSP_3Y is not set
@ -5763,7 +5763,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
@ -5776,7 +5776,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA238 is not set
-# CONFIG_SENSORS_INA2XX is not set
+CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
 # CONFIG_SENSORS_INSPUR_IPSPS is not set
 CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
@ -5796,17 +5796,17 @@ CONFIG_SENSORS_K8TEMP=m
 # CONFIG_SENSORS_LM25066 is not set
 # CONFIG_SENSORS_LM63 is not set
 CONFIG_SENSORS_LM70=m
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
 # CONFIG_SENSORS_LM80 is not set
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
 # CONFIG_SENSORS_LM95234 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_LM95245 is not set
@ -5912,11 +5912,11 @@ CONFIG_SENSORS_SMPRO=m
 CONFIG_SENSORS_TC74=m
 # CONFIG_SENSORS_TDA38640 is not set
 # CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
+CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
 # CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
 # CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_TPS23861 is not set
--- a/kernel-aarch64-rt-debug-rhel.config
+++ b/kernel-aarch64-rt-debug-rhel.config
@ -613,12 +613,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1452,8 +1453,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5567,7 +5567,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
@ -5827,7 +5827,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_EMC2305 is not set
 # CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
+CONFIG_SENSORS_F71882FG=m
 # CONFIG_SENSORS_F75375S is not set
 CONFIG_SENSORS_FSCHMD=m
 # CONFIG_SENSORS_FSP_3Y is not set
@ -5837,7 +5837,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
@ -5850,7 +5850,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA238 is not set
-# CONFIG_SENSORS_INA2XX is not set
+CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
 # CONFIG_SENSORS_INSPUR_IPSPS is not set
 CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
@ -5870,17 +5870,17 @@ CONFIG_SENSORS_K8TEMP=m
 # CONFIG_SENSORS_LM25066 is not set
 # CONFIG_SENSORS_LM63 is not set
 CONFIG_SENSORS_LM70=m
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
 # CONFIG_SENSORS_LM80 is not set
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
 # CONFIG_SENSORS_LM95234 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_LM95245 is not set
@ -5986,11 +5986,11 @@ CONFIG_SENSORS_SMPRO=m
 CONFIG_SENSORS_TC74=m
 # CONFIG_SENSORS_TDA38640 is not set
 # CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
+CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
 # CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
 # CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_TPS23861 is not set
--- a/kernel-aarch64-rt-rhel.config
+++ b/kernel-aarch64-rt-rhel.config
@ -613,12 +613,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1444,8 +1445,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5544,7 +5544,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
@ -5804,7 +5804,7 @@ CONFIG_SENSORS_CORETEMP=m
 # CONFIG_SENSORS_EMC2305 is not set
 # CONFIG_SENSORS_EMC6W201 is not set
 # CONFIG_SENSORS_F71805F is not set
-# CONFIG_SENSORS_F71882FG is not set
+CONFIG_SENSORS_F71882FG=m
 # CONFIG_SENSORS_F75375S is not set
 CONFIG_SENSORS_FSCHMD=m
 # CONFIG_SENSORS_FSP_3Y is not set
@ -5814,7 +5814,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_GIGABYTE_WATERFORCE is not set
 # CONFIG_SENSORS_GL518SM is not set
 # CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_GPIO_FAN=m
 # CONFIG_SENSORS_HIH6130 is not set
 # CONFIG_SENSORS_HMC5843_I2C is not set
 # CONFIG_SENSORS_HMC5843_SPI is not set
@ -5827,7 +5827,7 @@ CONFIG_SENSORS_G762=m
 # CONFIG_SENSORS_IIO_HWMON is not set
 # CONFIG_SENSORS_INA209 is not set
 # CONFIG_SENSORS_INA238 is not set
-# CONFIG_SENSORS_INA2XX is not set
+CONFIG_SENSORS_INA2XX=m
 CONFIG_SENSORS_INA3221=m
 # CONFIG_SENSORS_INSPUR_IPSPS is not set
 CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m
@ -5847,17 +5847,17 @@ CONFIG_SENSORS_K8TEMP=m
 # CONFIG_SENSORS_LM25066 is not set
 # CONFIG_SENSORS_LM63 is not set
 CONFIG_SENSORS_LM70=m
-# CONFIG_SENSORS_LM73 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
 # CONFIG_SENSORS_LM80 is not set
 # CONFIG_SENSORS_LM83 is not set
 # CONFIG_SENSORS_LM85 is not set
 # CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_LM93 is not set
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
 # CONFIG_SENSORS_LM95234 is not set
 # CONFIG_SENSORS_LM95241 is not set
 # CONFIG_SENSORS_LM95245 is not set
@ -5963,11 +5963,11 @@ CONFIG_SENSORS_SMPRO=m
 CONFIG_SENSORS_TC74=m
 # CONFIG_SENSORS_TDA38640 is not set
 # CONFIG_SENSORS_THMC50 is not set
-# CONFIG_SENSORS_TMP102 is not set
+CONFIG_SENSORS_TMP102=m
 CONFIG_SENSORS_TMP103=m
 # CONFIG_SENSORS_TMP108 is not set
-# CONFIG_SENSORS_TMP401 is not set
-# CONFIG_SENSORS_TMP421 is not set
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
 # CONFIG_SENSORS_TMP464 is not set
 # CONFIG_SENSORS_TMP513 is not set
 # CONFIG_SENSORS_TPS23861 is not set
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -469,12 +469,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1231,8 +1232,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5060,7 +5060,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -469,12 +469,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1223,8 +1224,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5039,7 +5039,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -468,12 +468,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1234,8 +1235,7 @@ CONFIG_DMADEVICES_VDEBUG=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -4993,7 +4993,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -468,12 +468,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1226,8 +1227,7 @@ CONFIG_DMABUF_MOVE_NOTIFY=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -4972,7 +4972,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -471,11 +471,12 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
 # CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1228,8 +1229,7 @@ CONFIG_DMABUF_MOVE_NOTIFY=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -4986,7 +4986,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -497,12 +497,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1314,8 +1315,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5285,7 +5285,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -497,12 +497,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1306,8 +1307,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5263,7 +5263,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
--- a/kernel-x86_64-rt-debug-rhel.config
+++ b/kernel-x86_64-rt-debug-rhel.config
@ -497,12 +497,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1316,8 +1317,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5336,7 +5336,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
--- a/kernel-x86_64-rt-rhel.config
+++ b/kernel-x86_64-rt-rhel.config
@ -497,12 +497,13 @@ CONFIG_BLK_DEV_SR=m
 # CONFIG_BLK_DEV_SX8 is not set
 # CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_DEV_THROTTLING=y
-# CONFIG_BLK_DEV_UBLK is not set
+CONFIG_BLKDEV_UBLK_LEGACY_OPCODES=y
+CONFIG_BLK_DEV_UBLK=m
 CONFIG_BLK_DEV_WRITE_MOUNTED=y
 CONFIG_BLK_DEV=y
 CONFIG_BLK_DEV_ZONED=y
 # CONFIG_BLK_INLINE_ENCRYPTION is not set
-# CONFIG_BLK_SED_OPAL is not set
+CONFIG_BLK_SED_OPAL=y
 CONFIG_BLK_WBT_MQ=y
 CONFIG_BLK_WBT=y
 CONFIG_BLOCK_LEGACY_AUTOLOAD=y
@ -1308,8 +1309,7 @@ CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 # CONFIG_DMA_FENCE_TRACE is not set
 # CONFIG_DMA_MAP_BENCHMARK is not set
-CONFIG_DMA_NUMA_CMA=y
-# CONFIG_DMA_PERNUMA_CMA is not set
+# CONFIG_DMA_NUMA_CMA is not set
 # CONFIG_DMAPOOL_TEST is not set
 # CONFIG_DMARD06 is not set
 # CONFIG_DMARD09 is not set
@ -5314,7 +5314,7 @@ CONFIG_RTW88_8821CE=m
 # CONFIG_RTW88_8821CU is not set
 CONFIG_RTW88_8822BE=m
 # CONFIG_RTW88_8822BS is not set
-# CONFIG_RTW88_8822BU is not set
+CONFIG_RTW88_8822BU=m
 CONFIG_RTW88_8822CE=m
 # CONFIG_RTW88_8822CS is not set
 # CONFIG_RTW88_8822CU is not set
--- a/kernel.changelog
+++ b/kernel.changelog
@ -2587,6 +2587,17 @@ Resolves:
 - Linux v6.9.0-0.rc0.855684c7d938
 Resolves: rhbz#1471185, rhbz#1495307, rhbz#1509329, rhbz#1518076, rhbz#1518874, rhbz#1519554, rhbz#1546831, rhbz#1559877, rhbz#1561171, rhbz#1563590, rhbz#1565704, rhbz#1565717, rhbz#1572321, rhbz#1574502, rhbz#1590829, rhbz#1595918, rhbz#1598366, rhbz#1602033, rhbz#1609604, rhbz#1610493, rhbz#1613522, rhbz#1638087, rhbz#1652256, rhbz#1652266, rhbz#1663728, rhbz#1670017, rhbz#1722136, rhbz#1730649, rhbz#1802694, rhbz#1810301, rhbz#1821565, rhbz#1831065, rhbz#1855161, rhbz#1856174, rhbz#1856176, rhbz#1858592, rhbz#1858594, rhbz#1858596, rhbz#1858599, rhbz#1869674, rhbz#1871130, rhbz#1876435, rhbz#1876436, rhbz#1876977, rhbz#1877192, rhbz#1880486, rhbz#1890304, rhbz#1903201, rhbz#1915073, rhbz#1915290, rhbz#1930649, rhbz#1939095, rhbz#1940075, rhbz#1940794, rhbz#1943423, rhbz#1945002, rhbz#1945179, rhbz#1945477, rhbz#1947240, rhbz#1948340, rhbz#1952426, rhbz#1952863, rhbz#1953486, rhbz#1956988, rhbz#1957210, rhbz#1957219, rhbz#1957305, rhbz#1957636, rhbz#1957819, rhbz#1961178, rhbz#1962936, rhbz#1964537, rhbz#1967640, rhbz#1972795, rhbz#1976270, rhbz#1976835, rhbz#1976877, rhbz#1976884, rhbz#1977056, rhbz#1977529, rhbz#1978539, rhbz#1979379, rhbz#1981406, rhbz#1983298, rhbz#1986223, rhbz#1988254, rhbz#1988384, rhbz#1990040, rhbz#1993393, rhbz#1994858, rhbz#1998953, rhbz#2000835, rhbz#2002344, rhbz#2004233, rhbz#2004821, rhbz#2006813, rhbz#2007430, rhbz#2012226, rhbz#2014492, rhbz#2019377, rhbz#2020132, rhbz#2022578, rhbz#2023782, rhbz#2024595, rhbz#2025985, rhbz#2026319, rhbz#2027506, rhbz#2031547, rhbz#2032758, rhbz#2034670, rhbz#2038999, rhbz#2040643, rhbz#2041184, rhbz#2041186, rhbz#2041365, rhbz#2041990, rhbz#2042240, rhbz#2042241, rhbz#2043141, rhbz#2044155, rhbz#2053836, rhbz#2054579, rhbz#2062054, rhbz#2062909, rhbz#2071969, rhbz#2089765, rhbz#2115876, rhbz#2120968, rhbz#2122595, rhbz#2140017, rhbz#2142658, rhbz#2149273, rhbz#2153073, rhbz#2166911, rhbz#2188441, rhbz#2208834, rhbz#2216678, rhbz#2227793, rhbz#2231407, rhbz#2233269

+* Mon May 20 2024 Jan Stancek <jstancek@redhat.com> [6.9.0-7.el10]
+- v6.9-rt5 (Sebastian Andrzej Siewior)
+- configs: move CONFIG_BLK_DEV_UBLK into rhel/configs/generic (Ming Lei)
+- configs: move CONFIG_BLK_SED_OPAL into redhat/configs/common/generic (Ming Lei)
+- RHEL-21097: rhel: aarch64 stop blocking a number of HW sensors (Peter Robinson)
+- redhat/configs: enable RTL8822BU for rhel (Jose Ignacio Tornos Martinez)
+- redhat/configs: remove CONFIG_DMA_PERNUMA_CMA and switch CONFIG_DMA_NUMA_CMA off (Jerry Snitselaar)
+- redhat: add IMA certificates (Jan Stancek)
+- redhat/kernel.spec: fix typo in move_kmod_list() variable (Jan Stancek)
+Resolves: 
+
 * Tue May 14 2024 Jan Stancek <jstancek@redhat.com> [6.9.0-6.el10]
 - Linux 6.9 (Linus Torvalds)
 - selftests/harness: Handle TEST_F()'s explicit exit codes (Mickaël Salaün)
@ -2762,7 +2773,7 @@ Resolves: rhbz#1471185, rhbz#1495307, rhbz#1509329, rhbz#1518076, rhbz#1518874,
 - redhat: move amd-pstate-ut.ko to modules-internal (Jan Stancek)
 - redhat/configs: enable CONFIG_LEDS_TRIGGER_NETDEV also for RHEL (Michal Schmidt) [RHEL-32110]
 - redhat/configs: Remove CONFIG_AMD_IOMMU_V2 (Jerry Snitselaar)
-Resolves: RHEL-23931, RHEL-32110
+Resolves: RHEL-29722 

 * Tue May 07 2024 Jan Stancek <jstancek@redhat.com> [6.9.0-0.rc7.5.el10]
 - Linux 6.9-rc7 (Linus Torvalds)
@ -4302,6 +4313,17 @@ Resolves: RHEL-29722
 - Linux v6.9.0-0.rc2
 Resolves: RHEL-29722

+* Mon May 20 2024 Jan Stancek <jstancek@redhat.com> [6.9.0-7.el10]
+- v6.9-rt5 (Sebastian Andrzej Siewior)
+- configs: move CONFIG_BLK_DEV_UBLK into rhel/configs/generic (Ming Lei)
+- configs: move CONFIG_BLK_SED_OPAL into redhat/configs/common/generic (Ming Lei)
+- RHEL-21097: rhel: aarch64 stop blocking a number of HW sensors (Peter Robinson)
+- redhat/configs: enable RTL8822BU for rhel (Jose Ignacio Tornos Martinez)
+- redhat/configs: remove CONFIG_DMA_PERNUMA_CMA and switch CONFIG_DMA_NUMA_CMA off (Jerry Snitselaar)
+- redhat: add IMA certificates (Jan Stancek)
+- redhat/kernel.spec: fix typo in move_kmod_list() variable (Jan Stancek)
+Resolves: RHEL-29722 
+
 * Tue May 14 2024 Jan Stancek <jstancek@redhat.com> [6.9.0-6.el10]
 - Linux 6.9 (Linus Torvalds)
 - selftests/harness: Handle TEST_F()'s explicit exit codes (Mickaël Salaün)
--- a/kernel.spec
+++ b/kernel.spec
@ -163,15 +163,15 @@ Summary: The Linux kernel
 %define specrpmversion 6.9.0
 %define specversion 6.9.0
 %define patchversion 6.9
-%define pkgrelease 6
+%define pkgrelease 7
 %define kversion 6
-%define tarfile_release 6.9.0-6.el10
+%define tarfile_release 6.9.0-7.el10
 # This is needed to do merge window version magic
 %define patchlevel 9
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 6%{?buildid}%{?dist}
+%define specrelease 7%{?buildid}%{?dist}
 # This defines the kabi tarball version
-%define kabiversion 6.9.0-6.el10
+%define kabiversion 6.9.0-7.el10

 # If this variable is set to 1, a bpf selftests build failure will cause a
 # fatal kernel package build error
@ -920,6 +920,17 @@ Source87: flavors
 Source100: rheldup3.x509
 Source101: rhelkpatch1.x509
 Source102: nvidiagpuoot001.x509
+Source103: rhelimaca1.x509
+Source104: rhelima.x509
+Source105: rhelima_centos.x509
+
+%if 0%{?centos}
+%define ima_signing_cert %{SOURCE105}
+%else
+%define ima_signing_cert %{SOURCE104}
+%endif
+
+%define ima_cert_name ima.cer

 Source200: check-kabi

@ -1895,7 +1906,8 @@ done
 openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem
 openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem
 openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem
-cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem > ../certs/rhel.pem
+openssl x509 -inform der -in %{SOURCE103} -out rhelimaca1.pem
+cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem rhelimaca1.pem > ../certs/rhel.pem
 %if %{signkernel}
 %ifarch s390x ppc64le
 openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem
@ -2577,7 +2589,7 @@ BuildKernel() {
        local module_list="$1"
        local subdir_name="$2"

-        mkdir -p "$RPM_BUILD_ROOT/lib/modules/$KernelVer/$subdirname"
+        mkdir -p "$RPM_BUILD_ROOT/lib/modules/$KernelVer/$subdir_name"

        set +x
        while read -r kmod; do
@ -2718,6 +2730,11 @@ BuildKernel() {
    %endif
 %endif

+%if 0%{?rhel}
+    # Red Hat IMA code-signing cert, which is used to authenticate package files
+    install -m 0644 %{ima_signing_cert} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/%{ima_cert_name}
+%endif
+
 %if %{signmodules}
    if [ $DoModules -eq 1 ]; then
        # Save the signing keys so we can sign the modules in __modsign_install_post
@ -3942,6 +3959,16 @@ fi\
 #
 #
 %changelog
+* Mon May 20 2024 Jan Stancek <jstancek@redhat.com> [6.9.0-7.el10]
+- v6.9-rt5 (Sebastian Andrzej Siewior)
+- configs: move CONFIG_BLK_DEV_UBLK into rhel/configs/generic (Ming Lei)
+- configs: move CONFIG_BLK_SED_OPAL into redhat/configs/common/generic (Ming Lei)
+- RHEL-21097: rhel: aarch64 stop blocking a number of HW sensors (Peter Robinson)
+- redhat/configs: enable RTL8822BU for rhel (Jose Ignacio Tornos Martinez)
+- redhat/configs: remove CONFIG_DMA_PERNUMA_CMA and switch CONFIG_DMA_NUMA_CMA off (Jerry Snitselaar)
+- redhat: add IMA certificates (Jan Stancek)
+- redhat/kernel.spec: fix typo in move_kmod_list() variable (Jan Stancek)
+
 * Tue May 14 2024 Jan Stancek <jstancek@redhat.com> [6.9.0-6.el10]
 - Linux 6.9 (Linus Torvalds)
 - selftests/harness: Handle TEST_F()'s explicit exit codes (Mickaël Salaün)
--- a/rhelima.x509
+++ b/rhelima.x509
--- a/rhelima_centos.x509
+++ b/rhelima_centos.x509
--- a/rhelimaca1.x509
+++ b/rhelimaca1.x509
--- a/6
+++ b/6
@ -1,5 +1,5 @@
 SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd
 SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6
-SHA512 (linux-6.9.0-6.el10.tar.xz) = f1407fcacd51b11c2c72ebee38bdc7ac3e228e35beeddea5fdb7dd42b8eb9e3143dffc6cd54d7522c5207d3931a037502ef52ed903f8c42e6802ab6e0cd14ad8
-SHA512 (kernel-abi-stablelists-6.9.0-6.el10.tar.xz) = a3163da58e6958dafb9daff68b982e5e075f17fe3472fd2d481a1d4a976eb982f2e57c8725adea2710989d8d23ea7ecdf0e0fd3e92d14571d1e641db34defd7a
-SHA512 (kernel-kabi-dw-6.9.0-6.el10.tar.xz) = 2eedb40175a8cf953cccee1acdacbcc61cd3cff97f900367cff8edbe3c0d659cd6b18068765dda427c3d541bdd176409406bbc5db4844825ef6b329615131c3c
+SHA512 (linux-6.9.0-7.el10.tar.xz) = 2920374af69669de8303ed4d12fe8f586e3abdd0d22364b895f417af3332e2bb7f3db9a6dd329d7a11e1e53012e527bbd97048461815d21a7b409ea265af303f
+SHA512 (kernel-abi-stablelists-6.9.0-7.el10.tar.xz) = 9303492a7e2cc1ed14c03340542ea3c05222d8302c84281526150c9e480ef09fceac206a95f0788e0dd7697eb1e65da6a6ab5e282e8a4f99915dad33f7c47cdf
+SHA512 (kernel-kabi-dw-6.9.0-7.el10.tar.xz) = 2eedb40175a8cf953cccee1acdacbcc61cd3cff97f900367cff8edbe3c0d659cd6b18068765dda427c3d541bdd176409406bbc5db4844825ef6b329615131c3c