kernel-5.19.0-0.rc1.20220610git874c8ca1e60b.18

* 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)
- fedora: drop X86_PLATFORM_DRIVERS_DELL dupe (Peter Robinson)
- redhat: change tools_make macro to avoid full override of variables in Makefile (Herton R. Krzesinski)
- Fix typo in Makefile for Fedora Stable Versioning (Justin M. Forbes)
- Remove duplicates from ark/generic/s390x/zfcpdump/ (Vladis Dronov)
- Move common/debug/s390x/zfcpdump/ configs to ark/debug/s390x/zfcpdump/ (Vladis Dronov)
- Move common/generic/s390x/zfcpdump/ configs to ark/generic/s390x/zfcpdump/ (Vladis Dronov)
Resolves:

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>

25 files changed, 89 insertions, 161 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index d93ab4b92..92aed85ff 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
 
 #
 # ZSTREAM
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 5f773e251..5db474977 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -476,7 +476,6 @@ CONFIG_ARM_TIMER_SP804=y
 CONFIG_ARMV8_DEPRECATED=y
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -645,7 +644,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1818,7 +1817,7 @@ CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
-# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -2034,7 +2033,7 @@ CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IMX8=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 CONFIG_DWMAC_IPQ806X=m
 # CONFIG_DWMAC_LOONGSON is not set
 CONFIG_DWMAC_MESON=m
@@ -2140,7 +2139,7 @@ CONFIG_EXTCON_AXP288=m
 # CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 # CONFIG_EXTCON_MAX3355 is not set
-# CONFIG_EXTCON_PTN5150 is not set
+CONFIG_EXTCON_PTN5150=m
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
@@ -3518,6 +3517,7 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS_ON_BOOT is not set
 CONFIG_KGDB_TESTS=y
 CONFIG_KGDB=y
+CONFIG_KHADAS_MCU_FAN_THERMAL=m
 # CONFIG_KMX61 is not set
 CONFIG_KPROBE_EVENT_GEN_TEST=m
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
@@ -3942,7 +3942,7 @@ CONFIG_MFD_INTEL_M10_BMC=m
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_KHADAS_MCU is not set
+CONFIG_MFD_KHADAS_MCU=m
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_LP3943 is not set
@@ -3977,7 +3977,6 @@ CONFIG_MFD_MAX77714=m
 # CONFIG_MFD_RETU is not set
 CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 CONFIG_MFD_ROHM_BD718XX=y
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -5608,7 +5607,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_QCOM_FASTRPC=m
 CONFIG_QCOM_GENI_SE=y
-# CONFIG_QCOM_GPI_DMA is not set
+CONFIG_QCOM_GPI_DMA=m
 CONFIG_QCOM_GSBI=y
 CONFIG_QCOM_HFPLL=m
 CONFIG_QCOM_HIDMA=m
@@ -7971,8 +7970,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -8823,7 +8820,7 @@ CONFIG_XILINX_XADC=m
 CONFIG_XILINX_ZYNQMP_DMA=m
 CONFIG_XILINX_ZYNQMP_DPDMA=m
 CONFIG_XILLYBUS=m
-# CONFIG_XILLYBUS_OF is not set
+CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
 CONFIG_XLNX_EVENT_MANAGER=y
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 11f87d1db..a0bb13437 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -3171,7 +3171,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -6367,8 +6366,6 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index 3107a04eb..bab19dcde 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -476,7 +476,6 @@ CONFIG_ARM_TIMER_SP804=y
 CONFIG_ARMV8_DEPRECATED=y
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -645,7 +644,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_BATTERY_MAX17040=m
 CONFIG_BATTERY_MAX17042=m
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1810,7 +1809,7 @@ CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
-# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -2026,7 +2025,7 @@ CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IMX8=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 CONFIG_DWMAC_IPQ806X=m
 # CONFIG_DWMAC_LOONGSON is not set
 CONFIG_DWMAC_MESON=m
@@ -2132,7 +2131,7 @@ CONFIG_EXTCON_AXP288=m
 # CONFIG_EXTCON_FSA9480 is not set
 CONFIG_EXTCON_GPIO=m
 # CONFIG_EXTCON_MAX3355 is not set
-# CONFIG_EXTCON_PTN5150 is not set
+CONFIG_EXTCON_PTN5150=m
 # CONFIG_EXTCON_QCOM_SPMI_MISC is not set
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
@@ -3499,6 +3498,7 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS_ON_BOOT is not set
 CONFIG_KGDB_TESTS=y
 CONFIG_KGDB=y
+CONFIG_KHADAS_MCU_FAN_THERMAL=m
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
@@ -3922,7 +3922,7 @@ CONFIG_MFD_INTEL_M10_BMC=m
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_KHADAS_MCU is not set
+CONFIG_MFD_KHADAS_MCU=m
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_LP3943 is not set
@@ -3957,7 +3957,6 @@ CONFIG_MFD_MAX77714=m
 # CONFIG_MFD_RETU is not set
 CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 CONFIG_MFD_ROHM_BD718XX=y
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -5587,7 +5586,7 @@ CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_FALKOR_ERRATUM_E1041=y
 CONFIG_QCOM_FASTRPC=m
 CONFIG_QCOM_GENI_SE=y
-# CONFIG_QCOM_GPI_DMA is not set
+CONFIG_QCOM_GPI_DMA=m
 CONFIG_QCOM_GSBI=y
 CONFIG_QCOM_HFPLL=m
 CONFIG_QCOM_HIDMA=m
@@ -7948,8 +7947,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -8800,7 +8797,7 @@ CONFIG_XILINX_XADC=m
 CONFIG_XILINX_ZYNQMP_DMA=m
 CONFIG_XILINX_ZYNQMP_DPDMA=m
 CONFIG_XILLYBUS=m
-# CONFIG_XILLYBUS_OF is not set
+CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
 CONFIG_XLNX_EVENT_MANAGER=y
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index c285b6fb9..b077fd0db 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -3150,7 +3150,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -6342,8 +6341,6 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 9976ef8ee..f3afc271d 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -482,7 +482,6 @@ CONFIG_ARM=y
 CONFIG_ARM_ZYNQ_CPUIDLE=y
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -661,7 +660,7 @@ CONFIG_BATTERY_DA9052=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_BATTERY_MAX17040=m
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1833,7 +1832,7 @@ CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
-# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -2054,7 +2053,7 @@ CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IMX8=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 CONFIG_DWMAC_IPQ806X=m
 # CONFIG_DWMAC_LOONGSON is not set
 CONFIG_DWMAC_MESON=m
@@ -3527,6 +3526,7 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS_ON_BOOT is not set
 CONFIG_KGDB_TESTS=y
 CONFIG_KGDB=y
+CONFIG_KHADAS_MCU_FAN_THERMAL=m
 # CONFIG_KMX61 is not set
 CONFIG_KPROBE_EVENT_GEN_TEST=m
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
@@ -3973,7 +3973,7 @@ CONFIG_MFD_INTEL_M10_BMC=m
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_KHADAS_MCU is not set
+CONFIG_MFD_KHADAS_MCU=m
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_LP3943 is not set
@@ -4009,7 +4009,6 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RETU is not set
 CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -6140,7 +6139,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RK808=m
@@ -8149,8 +8148,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 82b2c336a..493c538c5 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -482,7 +482,6 @@ CONFIG_ARM=y
 CONFIG_ARM_ZYNQ_CPUIDLE=y
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -661,7 +660,7 @@ CONFIG_BATTERY_DA9052=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_BATTERY_MAX17040=m
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1826,7 +1825,7 @@ CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
-# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -2047,7 +2046,7 @@ CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IMX8=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 CONFIG_DWMAC_IPQ806X=m
 # CONFIG_DWMAC_LOONGSON is not set
 CONFIG_DWMAC_MESON=m
@@ -3510,6 +3509,7 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS_ON_BOOT is not set
 CONFIG_KGDB_TESTS=y
 CONFIG_KGDB=y
+CONFIG_KHADAS_MCU_FAN_THERMAL=m
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
@@ -3955,7 +3955,7 @@ CONFIG_MFD_INTEL_M10_BMC=m
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_KHADAS_MCU is not set
+CONFIG_MFD_KHADAS_MCU=m
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_LP3943 is not set
@@ -3991,7 +3991,6 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RETU is not set
 CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -6121,7 +6120,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RK808=m
@@ -8128,8 +8127,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 4bc59c43a..bd36165e2 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -472,7 +472,6 @@ CONFIG_ARM_VIRT_EXT=y
 CONFIG_ARM=y
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -643,7 +642,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_BATTERY_MAX17040=m
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1790,7 +1789,7 @@ CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
-# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -2011,7 +2010,7 @@ CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IMX8=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
@@ -3459,6 +3458,7 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS_ON_BOOT is not set
 CONFIG_KGDB_TESTS=y
 CONFIG_KGDB=y
+CONFIG_KHADAS_MCU_FAN_THERMAL=m
 # CONFIG_KMX61 is not set
 CONFIG_KPROBE_EVENT_GEN_TEST=m
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
@@ -3894,7 +3894,7 @@ CONFIG_MFD_INTEL_M10_BMC=m
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_KHADAS_MCU is not set
+CONFIG_MFD_KHADAS_MCU=m
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_LP3943 is not set
@@ -3929,7 +3929,6 @@ CONFIG_MFD_PALMAS=y
 # CONFIG_MFD_RETU is not set
 CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -5965,7 +5964,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RK808=m
@@ -7911,8 +7910,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -8782,7 +8779,7 @@ CONFIG_XILINX_XADC=m
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 CONFIG_XILINX_ZYNQMP_DPDMA=m
 CONFIG_XILLYBUS=m
-# CONFIG_XILLYBUS_OF is not set
+CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
 CONFIG_XZ_DEC_ARMTHUMB=y
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 38a167dcd..0580445c1 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -472,7 +472,6 @@ CONFIG_ARM_VIRT_EXT=y
 CONFIG_ARM=y
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -643,7 +642,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 CONFIG_BATTERY_GAUGE_LTC2941=m
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 CONFIG_BATTERY_MAX17040=m
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1783,7 +1782,7 @@ CONFIG_DRM_PANEL_ELIDA_KD35T133=m
 CONFIG_DRM_PANEL_FEIXIN_K101_IM2BA02=m
 CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m
 CONFIG_DRM_PANEL_ILITEK_IL9322=m
-# CONFIG_DRM_PANEL_ILITEK_ILI9341 is not set
+CONFIG_DRM_PANEL_ILITEK_ILI9341=m
 CONFIG_DRM_PANEL_ILITEK_ILI9881C=m
 CONFIG_DRM_PANEL_INNOLUX_EJ030NA=m
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
@@ -2004,7 +2003,7 @@ CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_DWC_QOS_ETH=m
 CONFIG_DWMAC_GENERIC=m
 CONFIG_DWMAC_IMX8=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
 CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
@@ -3442,6 +3441,7 @@ CONFIG_KGDB_SERIAL_CONSOLE=y
 # CONFIG_KGDB_TESTS_ON_BOOT is not set
 CONFIG_KGDB_TESTS=y
 CONFIG_KGDB=y
+CONFIG_KHADAS_MCU_FAN_THERMAL=m
 # CONFIG_KMX61 is not set
 # CONFIG_KPROBE_EVENT_GEN_TEST is not set
 # CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
@@ -3876,7 +3876,7 @@ CONFIG_MFD_INTEL_M10_BMC=m
 # CONFIG_MFD_IQS62X is not set
 # CONFIG_MFD_JANZ_CMODIO is not set
 # CONFIG_MFD_KEMPLD is not set
-# CONFIG_MFD_KHADAS_MCU is not set
+CONFIG_MFD_KHADAS_MCU=m
 # CONFIG_MFD_LM3533 is not set
 # CONFIG_MFD_LOCHNAGAR is not set
 # CONFIG_MFD_LP3943 is not set
@@ -3911,7 +3911,6 @@ CONFIG_MFD_PALMAS=y
 # CONFIG_MFD_RETU is not set
 CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -5946,7 +5945,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_PL030=y
 CONFIG_RTC_DRV_PL031=y
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RK808=m
@@ -7890,8 +7889,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
@@ -8761,7 +8758,7 @@ CONFIG_XILINX_XADC=m
 # CONFIG_XILINX_ZYNQMP_DMA is not set
 CONFIG_XILINX_ZYNQMP_DPDMA=m
 CONFIG_XILLYBUS=m
-# CONFIG_XILLYBUS_OF is not set
+CONFIG_XILLYBUS_OF=m
 CONFIG_XILLYBUS_PCIE=m
 CONFIG_XILLYUSB=m
 CONFIG_XZ_DEC_ARMTHUMB=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 6910d2a4d..ab2b36bba 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -289,7 +289,6 @@ CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -447,7 +446,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1605,7 +1604,7 @@ CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DW_XDATA_PCIE=m
@@ -3354,7 +3353,6 @@ CONFIG_MFD_MAX77714=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -4744,7 +4742,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_UART is not set
 # CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCOM_A7PLL is not set
-# CONFIG_QCOM_ADM is not set
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_GPI_DMA is not set
 # CONFIG_QCOM_HIDMA is not set
@@ -5078,7 +5075,7 @@ CONFIG_RTC_DRV_PCF8523=m
 # CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m
@@ -6817,8 +6814,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 8a429a845..faebda27e 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -208,7 +208,6 @@ CONFIG_AQUANTIA_PHY=m
 # CONFIG_ARCH_BCM2835 is not set
 # CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_LG1K is not set
 CONFIG_ARCH_MEMORY_PROBE=y
@@ -2998,7 +2997,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -6124,8 +6122,6 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index f038b9506..f1d3abe7d 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -288,7 +288,6 @@ CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -446,7 +445,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1596,7 +1595,7 @@ CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DW_XDATA_PCIE=m
@@ -3334,7 +3333,6 @@ CONFIG_MFD_MAX77714=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -4723,7 +4721,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_UART is not set
 # CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCOM_A7PLL is not set
-# CONFIG_QCOM_ADM is not set
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_GPI_DMA is not set
 # CONFIG_QCOM_HIDMA is not set
@@ -5057,7 +5054,7 @@ CONFIG_RTC_DRV_PCF8523=m
 # CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m
@@ -6794,8 +6791,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 31f3e8311..de42dda21 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -208,7 +208,6 @@ CONFIG_AQUANTIA_PHY=m
 # CONFIG_ARCH_BCM2835 is not set
 # CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_LG1K is not set
 CONFIG_ARCH_MEMORY_PROBE=y
@@ -2978,7 +2977,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -6101,8 +6099,6 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 953b16b9e..11231cacc 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -293,7 +293,6 @@ CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -451,7 +450,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1612,7 +1611,7 @@ CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DW_XDATA_PCIE=m
@@ -3338,7 +3337,6 @@ CONFIG_MFD_MAX77714=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -4679,7 +4677,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_UART is not set
 # CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCOM_A7PLL is not set
-# CONFIG_QCOM_ADM is not set
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_GPI_DMA is not set
 # CONFIG_QCOM_HIDMA is not set
@@ -5016,7 +5013,7 @@ CONFIG_RTC_DRV_PCF8523=m
 # CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m
@@ -6777,8 +6774,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 0a91c8740..460e8e149 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -209,7 +209,6 @@ CONFIG_AQUANTIA_PHY=m
 # CONFIG_ARCH_BCM2835 is not set
 # CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_MESON is not set
@@ -2984,7 +2983,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -4515,7 +4513,7 @@ CONFIG_S390_TAPE_34XX=m
 CONFIG_S390_TAPE_3590=m
 CONFIG_S390_TAPE=m
 # CONFIG_S390_UNWIND_SELFTEST is not set
-CONFIG_S390_UV_UAPI=m
+CONFIG_S390_UV_UAPI=y
 CONFIG_S390_VMUR=m
 # CONFIG_SAMPLE_ANDROID_BINDERFS is not set
 # CONFIG_SAMPLE_AUXDISPLAY is not set
@@ -6116,8 +6114,6 @@ CONFIG_UIO_HV_GENERIC=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 70b40ce4e..6dc676ef5 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -292,7 +292,6 @@ CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 # CONFIG_ASUS_TF103C_DOCK is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -450,7 +449,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_BATTERY_MAX17040 is not set
 # CONFIG_BATTERY_MAX17042 is not set
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1603,7 +1602,7 @@ CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DW_XDATA_PCIE=m
@@ -3318,7 +3317,6 @@ CONFIG_MFD_MAX77714=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -4658,7 +4656,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_UART is not set
 # CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCOM_A7PLL is not set
-# CONFIG_QCOM_ADM is not set
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_GPI_DMA is not set
 # CONFIG_QCOM_HIDMA is not set
@@ -4995,7 +4992,7 @@ CONFIG_RTC_DRV_PCF8523=m
 # CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m
@@ -6754,8 +6751,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index ff605855a..ce82fcad2 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -209,7 +209,6 @@ CONFIG_AQUANTIA_PHY=m
 # CONFIG_ARCH_BCM2835 is not set
 # CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_MESON is not set
@@ -2964,7 +2963,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -4494,7 +4492,7 @@ CONFIG_S390_TAPE_34XX=m
 CONFIG_S390_TAPE_3590=m
 CONFIG_S390_TAPE=m
 # CONFIG_S390_UNWIND_SELFTEST is not set
-CONFIG_S390_UV_UAPI=m
+CONFIG_S390_UV_UAPI=y
 CONFIG_S390_VMUR=m
 # CONFIG_SAMPLE_ANDROID_BINDERFS is not set
 # CONFIG_SAMPLE_AUXDISPLAY is not set
@@ -6093,8 +6091,6 @@ CONFIG_UIO_HV_GENERIC=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index e8bea0b1d..c7b82fc33 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -209,7 +209,6 @@ CONFIG_AQUANTIA_PHY=m
 # CONFIG_ARCH_BCM2835 is not set
 # CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_MESON is not set
@@ -2976,7 +2975,6 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -4510,7 +4508,7 @@ CONFIG_S390_TAPE_34XX=m
 CONFIG_S390_TAPE_3590=m
 # CONFIG_S390_TAPE is not set
 # CONFIG_S390_UNWIND_SELFTEST is not set
-CONFIG_S390_UV_UAPI=y
+# CONFIG_S390_UV_UAPI is not set
 CONFIG_S390_VMUR=y
 CONFIG_S390=y
 # CONFIG_SAMPLE_ANDROID_BINDERFS is not set
@@ -6119,8 +6117,6 @@ CONFIG_UIO_HV_GENERIC=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 # CONFIG_UNIX is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 466ff22d6..f5ead4133 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -328,7 +328,6 @@ CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
 CONFIG_ASUS_TF103C_DOCK=m
@@ -495,7 +494,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_BATTERY_MAX17040 is not set
 CONFIG_BATTERY_MAX17042=m
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1731,7 +1730,7 @@ CONFIG_DW_DMAC_PCI=y
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_INTEL=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DW_XDATA_PCIE=m
@@ -3638,7 +3637,6 @@ CONFIG_MFD_MAX77714=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -5081,7 +5079,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_UART is not set
 # CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCOM_A7PLL is not set
-# CONFIG_QCOM_ADM is not set
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_GPI_DMA is not set
 # CONFIG_QCOM_HIDMA is not set
@@ -5421,7 +5418,7 @@ CONFIG_RTC_DRV_PCF8523=m
 # CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m
@@ -7213,8 +7210,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 5211a197c..1db7d2a67 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -232,7 +232,6 @@ CONFIG_AQUANTIA_PHY=m
 # CONFIG_ARCH_BCM2835 is not set
 # CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_MEMORY_PROBE is not set
@@ -3164,7 +3163,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -6354,8 +6352,6 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 79fe1eb15..17f7dcd58 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -327,7 +327,6 @@ CONFIG_ARM_SMCCC_SOC_ID=y
 # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set
 # CONFIG_AS3935 is not set
 # CONFIG_AS73211 is not set
-# CONFIG_ASHMEM is not set
 CONFIG_ASUS_LAPTOP=m
 CONFIG_ASUS_NB_WMI=m
 CONFIG_ASUS_TF103C_DOCK=m
@@ -494,7 +493,7 @@ CONFIG_BATTERY_CW2015=m
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
 # CONFIG_BATTERY_GAUGE_LTC2941 is not set
-CONFIG_BATTERY_GOLDFISH=m
+# CONFIG_BATTERY_GOLDFISH is not set
 # CONFIG_BATTERY_MAX17040 is not set
 CONFIG_BATTERY_MAX17042=m
 # CONFIG_BATTERY_MAX1721X is not set
@@ -1722,7 +1721,7 @@ CONFIG_DW_DMAC_PCI=y
 CONFIG_DW_EDMA=m
 CONFIG_DW_EDMA_PCIE=m
 CONFIG_DWMAC_INTEL=m
-CONFIG_DWMAC_INTEL_PLAT=m
+# CONFIG_DWMAC_INTEL_PLAT is not set
 # CONFIG_DWMAC_LOONGSON is not set
 # CONFIG_DW_WATCHDOG is not set
 CONFIG_DW_XDATA_PCIE=m
@@ -3619,7 +3618,6 @@ CONFIG_MFD_MAX77714=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -5061,7 +5059,6 @@ CONFIG_PWRSEQ_SIMPLE=m
 # CONFIG_QCA7000_UART is not set
 # CONFIG_QCM_GCC_2290 is not set
 # CONFIG_QCOM_A7PLL is not set
-# CONFIG_QCOM_ADM is not set
 # CONFIG_QCOM_CPR is not set
 # CONFIG_QCOM_GPI_DMA is not set
 # CONFIG_QCOM_HIDMA is not set
@@ -5401,7 +5398,7 @@ CONFIG_RTC_DRV_PCF8523=m
 # CONFIG_RTC_DRV_PCF85363 is not set
 CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_PM8XXX=m
+# CONFIG_RTC_DRV_PM8XXX is not set
 CONFIG_RTC_DRV_R7301=m
 CONFIG_RTC_DRV_R9701=m
 CONFIG_RTC_DRV_RP5C01=m
@@ -7191,8 +7188,6 @@ CONFIG_ULI526X=m
 # CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
 CONFIG_UNICODE_UTF8_DATA=y
 CONFIG_UNICODE=y
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index aaaf14864..02dcf12a6 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -232,7 +232,6 @@ CONFIG_AQUANTIA_PHY=m
 # CONFIG_ARCH_BCM2835 is not set
 # CONFIG_ARCH_BCM4908 is not set
 # CONFIG_ARCH_BITMAIN is not set
-# CONFIG_ARCH_BRCMSTB is not set
 # CONFIG_ARCH_KEEMBAY is not set
 # CONFIG_ARCH_LG1K is not set
 # CONFIG_ARCH_MEMORY_PROBE is not set
@@ -3144,7 +3143,6 @@ CONFIG_MFD_INTEL_LPSS_PCI=m
 # CONFIG_MFD_RETU is not set
 # CONFIG_MFD_RK808 is not set
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD70528 is not set
 # CONFIG_MFD_ROHM_BD71828 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
 # CONFIG_MFD_ROHM_BD957XMUF is not set
@@ -6330,8 +6328,6 @@ CONFIG_UIO_PCI_GENERIC=m
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
-# CONFIG_UNISYSSPAR is not set
-# CONFIG_UNISYS_VISORBUS is not set
 CONFIG_UNIX98_PTYS=y
 CONFIG_UNIX_DIAG=y
 CONFIG_UNIXWARE_DISKLABEL=y
diff --git a/kernel.spec b/kernel.spec
index b3d53b138..dbb8179d8 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -124,13 +124,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 5.19.0
 %define patchversion 5.19
-%define pkgrelease 0.rc1.20220609git6bfb56e93bce.17
+%define pkgrelease 0.rc1.20220610git874c8ca1e60b.18
 %define kversion 5
-%define tarfile_release 5.19-rc1-24-g6bfb56e93bce
+%define tarfile_release 5.19-rc1-95-g874c8ca1e60b
 # This is needed to do merge window version magic
 %define patchlevel 19
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20220609git6bfb56e93bce.17%{?buildid}%{?dist}
+%define specrelease 0.rc1.20220610git874c8ca1e60b.18%{?buildid}%{?dist}
 
 #
 # End of genspec.sh variables
@@ -2228,7 +2228,7 @@ chmod +x tools/perf/check-headers.sh
 %endif
 
 %global tools_make \
-  %{make} CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{?make_opts}
+  CFLAGS="${RPM_OPT_FLAGS}" LDFLAGS="%{__global_ldflags}" %{make} %{?make_opts}
 
 %if %{with_tools}
 %ifarch %{cpupowerarchs}
@@ -2249,10 +2249,10 @@ chmod +x tools/power/cpupower/utils/version-gen.sh
    %{tools_make}
    popd
    pushd tools/power/x86/intel-speed-select
-   %{make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3"
+   %{tools_make}
    popd
    pushd tools/arch/x86/intel_sdsi
-   %{tools_make}
+   %{tools_make} CFLAGS="${RPM_OPT_FLAGS}"
    popd
 %endif
 %endif
@@ -2517,10 +2517,10 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
    %{tools_make} DESTDIR=%{buildroot} install
    popd
    pushd tools/power/x86/intel-speed-select
-   %{tools_make} CFLAGS+="-D_GNU_SOURCE -Iinclude -I/usr/include/libnl3" DESTDIR=%{buildroot} install
+   %{tools_make} DESTDIR=%{buildroot} install
    popd
    pushd tools/arch/x86/intel_sdsi
-   %{tools_make} DESTDIR=%{buildroot} install
+   %{tools_make} CFLAGS="${RPM_OPT_FLAGS}" DESTDIR=%{buildroot} install
    popd
 %endif
 pushd tools/thermal/tmon
@@ -3040,6 +3040,16 @@ fi
 #
 #
 %changelog
+* 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)
+- fedora: drop X86_PLATFORM_DRIVERS_DELL dupe (Peter Robinson)
+- redhat: change tools_make macro to avoid full override of variables in Makefile (Herton R. Krzesinski)
+- Fix typo in Makefile for Fedora Stable Versioning (Justin M. Forbes)
+- Remove duplicates from ark/generic/s390x/zfcpdump/ (Vladis Dronov)
+- Move common/debug/s390x/zfcpdump/ configs to ark/debug/s390x/zfcpdump/ (Vladis Dronov)
+- Move common/generic/s390x/zfcpdump/ configs to ark/generic/s390x/zfcpdump/ (Vladis Dronov)
+
 * Thu Jun 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.19.0-0.rc1.6bfb56e93bce.16]
 - Drop RCU_EXP_CPU_STALL_TIMEOUT to 0, we are not really android (Justin M. Forbes)
 
diff --git a/patch-5.19-redhat.patch b/patch-5.19-redhat.patch
index 62429c4a7..52cbc1072 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 c43d825a3c4c..3a870536497b 100644
+index b2e93c1a8021..402c2814a782 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -134,7 +134,7 @@ index c43d825a3c4c..3a870536497b 100644
  # We are using a recursive build, so we need to do a little thinking
  # to get the ordering right.
  #
-@@ -1240,7 +1244,13 @@ define filechk_version.h
+@@ -1244,7 +1248,13 @@ define filechk_version.h
  	((c) > 255 ? 255 : (c)))';                                       \
  	echo \#define LINUX_VERSION_MAJOR $(VERSION);                    \
  	echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL);            \
@@ -2538,10 +2538,10 @@ index 7fc4e9f49f54..6f0b0b2dc73d 100644
 
  #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/init/Kconfig b/init/Kconfig
-index c984afc489de..7f2dd88b6090 100644
+index c7900e8975f1..ea721c12c251 100644
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1669,7 +1669,7 @@ config AIO
+@@ -1678,7 +1678,7 @@ config AIO
  	  this option saves about 7k.
 
  config IO_URING
diff --git a/sources b/sources
index 072cf4314..9e07c2ca0 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.19-rc1-24-g6bfb56e93bce.tar.xz) = 77ea65fc3b55393778092ed28c94b2e6834793d4154060c537bdd61ac3d55b8418e7921fdced1c4eb52df176ff931f531b8abf2bda078b29566339b1973d04c2
-SHA512 (kernel-abi-stablelists-5.19.0-0.rc1.20220609git6bfb56e93bce.17.tar.bz2) = 1b18869ad4d9df750095ca2dbb02a19b7d01f5821ac5d713d4a2b9ab3d1e42c747c08ba853bc5bbbc8f08a1d70035da8f23f3b9544db9864d1e4528928b008b7
-SHA512 (kernel-kabi-dw-5.19.0-0.rc1.20220609git6bfb56e93bce.17.tar.bz2) = 92470cb7c8cfa492f6f68c947f058a70315eee48eb8cc1187ac104508e18979a56995513b5307642cbdc45cb283ccc42e7287d62124b9b5c3c017f9970f6538f
+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