kernel-5.13.0-0.rc1.13

* Mon May 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc1.13] - Remove unused boot loader specification files (David Ward) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2021-05-10 09:28:06 -05:00 · 2021-05-10 09:28:06 -05:00 · 1cac231319
commit 1cac231319
parent 021f420fbf
29 changed files with 184 additions and 228 deletions
--- 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 = 10
+RHEL_RELEASE = 13

 #
 # Early y+1 numbering
--- a/generate_bls_conf.sh
+++ b/generate_bls_conf.sh
@ -1,35 +0,0 @@
-#!/bin/bash
-set -e
-
-# shellcheck disable=SC1091
-. /etc/os-release
-
-kernelver=$1 && shift
-rootfs=$1 && shift
-variant=$1 && shift
-
-output="${rootfs}/lib/modules/${kernelver}/bls.conf"
-date=$(date -u +%Y%m%d%H%M%S)
-
-if [ "${variant:-5}" = "debug" ]; then
-    debugname=" with debugging"
-    debugid="-debug"
-else
-    debugname=""
-    debugid=""
-fi
-
-# shellcheck will complain about bootprefix being referenced but not assigned,
-# but that is perfectly OK here.
-# shellcheck disable=SC2154
-cat > "$output" <<EOF
-title ${NAME} (${kernelver}) ${VERSION}${debugname}
-version ${kernelver}${debugid}
-linux ${bootprefix}/vmlinuz-${kernelver}
-initrd ${bootprefix}/initramfs-${kernelver}.img
-options \$kernelopts
-id ${ID}-${date}-${kernelver}${debugid}
-grub_users \$grub_users
-grub_arg --unrestricted
-grub_class kernel${variant}
-EOF
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -31,7 +31,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -2232,7 +2231,7 @@ CONFIG_FSL_DPAA2_ETH=m
 CONFIG_FSL_DPAA2_ETHSW=m
 CONFIG_FSL_DPAA2_PTP_CLOCK=m
 CONFIG_FSL_DPAA2_QDMA=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
+CONFIG_FSL_DPAA2_SWITCH=m
 CONFIG_FSL_DPAA2=y
 # CONFIG_FSL_DPAA_CHECKING is not set
 CONFIG_FSL_DPAA_ETH=m
@ -2794,7 +2793,7 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
+CONFIG_IIO_SCMI=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3918,6 +3917,7 @@ CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -4048,7 +4048,7 @@ CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -5017,7 +5017,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
-CONFIG_PCIE_TEGRA194_HOST=m
+CONFIG_PCIE_TEGRA194_HOST=y
 CONFIG_PCIE_XILINX_CPM=y
 CONFIG_PCIE_XILINX_NWL=y
 CONFIG_PCIE_XILINX=y
@ -5126,7 +5126,7 @@ CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN50I_USB3=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 # CONFIG_PHY_SUN9I_USB is not set
-CONFIG_PHY_TEGRA194_P2U=m
+CONFIG_PHY_TEGRA194_P2U=y
 CONFIG_PHY_TEGRA_XUSB=m
 # CONFIG_PHY_TUSB1210 is not set
 CONFIG_PHY_XGENE=y
@ -5392,7 +5392,7 @@ CONFIG_PWM_IMX27=m
 CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_PCA9685=m
-# CONFIG_PWM_RASPBERRYPI_POE is not set
+CONFIG_PWM_RASPBERRYPI_POE=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_STMPE=y
 CONFIG_PWM_SUN4I=m
@ -6702,7 +6702,7 @@ CONFIG_SND_SOC_FSL_EASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_FSL_MQS=m
-# CONFIG_SND_SOC_FSL_RPMSG is not set
+CONFIG_SND_SOC_FSL_RPMSG=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
@ -6715,11 +6715,13 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ICS43432=m
 # CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_IMX_AUDIO_RPMSG=m
 CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 CONFIG_SND_SOC_IMX_HDMI=m
-# CONFIG_SND_SOC_IMX_RPMSG is not set
+CONFIG_SND_SOC_IMX_PCM_RPMSG=m
+CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@ -7144,7 +7146,7 @@ CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
 CONFIG_SUN50I_H616_CCU=y
 CONFIG_SUN50I_H6_CCU=y
 CONFIG_SUN50I_H6_R_CCU=y
-# CONFIG_SUN50I_IOMMU is not set
+CONFIG_SUN50I_IOMMU=y
 CONFIG_SUN6I_MSGBOX=y
 # CONFIG_SUN8I_A83T_CCU is not set
 CONFIG_SUN8I_DE2_CCU=y
@ -8381,7 +8383,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_WQ_WATCHDOG=y
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@ -8422,7 +8425,7 @@ CONFIG_XGENE_SLIMPRO_MBOX=m
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
+CONFIG_XILINX_INTC=y
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_SDFEC=m
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -11,7 +11,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACORN_PARTITION is not set
@ -3252,7 +3251,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMC_WBSD is not set
 CONFIG_MMIOTRACE=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -31,7 +31,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -2216,7 +2215,7 @@ CONFIG_FSL_DPAA2_ETH=m
 CONFIG_FSL_DPAA2_ETHSW=m
 CONFIG_FSL_DPAA2_PTP_CLOCK=m
 CONFIG_FSL_DPAA2_QDMA=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
+CONFIG_FSL_DPAA2_SWITCH=m
 CONFIG_FSL_DPAA2=y
 # CONFIG_FSL_DPAA_CHECKING is not set
 CONFIG_FSL_DPAA_ETH=m
@ -2778,7 +2777,7 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
+CONFIG_IIO_SCMI=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3895,6 +3894,7 @@ CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -4025,7 +4025,7 @@ CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -4994,7 +4994,7 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
-CONFIG_PCIE_TEGRA194_HOST=m
+CONFIG_PCIE_TEGRA194_HOST=y
 CONFIG_PCIE_XILINX_CPM=y
 CONFIG_PCIE_XILINX_NWL=y
 CONFIG_PCIE_XILINX=y
@ -5103,7 +5103,7 @@ CONFIG_PHY_SUN4I_USB=m
 CONFIG_PHY_SUN50I_USB3=m
 CONFIG_PHY_SUN6I_MIPI_DPHY=m
 # CONFIG_PHY_SUN9I_USB is not set
-CONFIG_PHY_TEGRA194_P2U=m
+CONFIG_PHY_TEGRA194_P2U=y
 CONFIG_PHY_TEGRA_XUSB=m
 # CONFIG_PHY_TUSB1210 is not set
 CONFIG_PHY_XGENE=y
@ -5369,7 +5369,7 @@ CONFIG_PWM_IMX27=m
 CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_PCA9685=m
-# CONFIG_PWM_RASPBERRYPI_POE is not set
+CONFIG_PWM_RASPBERRYPI_POE=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_STMPE=y
 CONFIG_PWM_SUN4I=m
@ -6678,7 +6678,7 @@ CONFIG_SND_SOC_FSL_EASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_FSL_MQS=m
-# CONFIG_SND_SOC_FSL_RPMSG is not set
+CONFIG_SND_SOC_FSL_RPMSG=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
@ -6691,11 +6691,13 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ICS43432=m
 # CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_IMX_AUDIO_RPMSG=m
 CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 CONFIG_SND_SOC_IMX_HDMI=m
-# CONFIG_SND_SOC_IMX_RPMSG is not set
+CONFIG_SND_SOC_IMX_PCM_RPMSG=m
+CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@ -7119,7 +7121,7 @@ CONFIG_SUN50I_ERRATUM_UNKNOWN1=y
 CONFIG_SUN50I_H616_CCU=y
 CONFIG_SUN50I_H6_CCU=y
 CONFIG_SUN50I_H6_R_CCU=y
-# CONFIG_SUN50I_IOMMU is not set
+CONFIG_SUN50I_IOMMU=y
 CONFIG_SUN6I_MSGBOX=y
 # CONFIG_SUN8I_A83T_CCU is not set
 CONFIG_SUN8I_DE2_CCU=y
@ -8356,7 +8358,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
@ -8396,7 +8399,7 @@ CONFIG_XGENE_SLIMPRO_MBOX=m
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
+CONFIG_XILINX_INTC=y
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 CONFIG_XILINX_SDFEC=m
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -11,7 +11,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACORN_PARTITION is not set
@ -3232,7 +3231,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMC_WBSD is not set
 # CONFIG_MMIOTRACE is not set
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -30,7 +30,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -2819,7 +2818,7 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
+CONFIG_IIO_SCMI=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3985,6 +3984,7 @@ CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MICREL_KS8995MA=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -4123,7 +4123,7 @@ CONFIG_MMC=y
 CONFIG_MMP_PDMA=y
 CONFIG_MMP_TDMA=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -5500,7 +5500,7 @@ CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_OMAP_DMTIMER=m
 CONFIG_PWM_PCA9685=m
-# CONFIG_PWM_RASPBERRYPI_POE is not set
+CONFIG_PWM_RASPBERRYPI_POE=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_STI=m
@ -6861,7 +6861,7 @@ CONFIG_SND_SOC_FSL_EASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_FSL_MQS=m
-# CONFIG_SND_SOC_FSL_RPMSG is not set
+CONFIG_SND_SOC_FSL_RPMSG=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
@ -6875,13 +6875,15 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_ICS43432=m
 # CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_IMX_AUDIO_RPMSG=m
 CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_HDMI=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_PCM_FIQ=m
-# CONFIG_SND_SOC_IMX_RPMSG is not set
+CONFIG_SND_SOC_IMX_PCM_RPMSG=m
+CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@ -8670,7 +8672,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_WQ_WATCHDOG=y
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@ -8708,7 +8711,7 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
+CONFIG_XILINX_INTC=y
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -30,7 +30,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -2804,7 +2803,7 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
+CONFIG_IIO_SCMI=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3963,6 +3962,7 @@ CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MICREL_KS8995MA=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -4101,7 +4101,7 @@ CONFIG_MMC=y
 CONFIG_MMP_PDMA=y
 CONFIG_MMP_TDMA=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -5478,7 +5478,7 @@ CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 CONFIG_PWM_OMAP_DMTIMER=m
 CONFIG_PWM_PCA9685=m
-# CONFIG_PWM_RASPBERRYPI_POE is not set
+CONFIG_PWM_RASPBERRYPI_POE=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 CONFIG_PWM_STI=m
@ -6838,7 +6838,7 @@ CONFIG_SND_SOC_FSL_EASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_FSL_MQS=m
-# CONFIG_SND_SOC_FSL_RPMSG is not set
+CONFIG_SND_SOC_FSL_RPMSG=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
@ -6852,13 +6852,15 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
 CONFIG_SND_SOC_ICS43432=m
 # CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_IMX_AUDIO_RPMSG=m
 CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 CONFIG_SND_SOC_IMX_ES8328=m
 CONFIG_SND_SOC_IMX_HDMI=m
 CONFIG_SND_SOC_IMX_PCM_DMA=m
 CONFIG_SND_SOC_IMX_PCM_FIQ=m
-# CONFIG_SND_SOC_IMX_RPMSG is not set
+CONFIG_SND_SOC_IMX_PCM_RPMSG=m
+CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@ -8646,7 +8648,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
@ -8683,7 +8686,7 @@ CONFIG_XFS_SUPPORT_V4=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
+CONFIG_XILINX_INTC=y
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -30,7 +30,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -2762,7 +2761,7 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
+CONFIG_IIO_SCMI=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3899,6 +3898,7 @@ CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MICREL_KS8995MA=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -4031,7 +4031,7 @@ CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -5366,7 +5366,7 @@ CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 # CONFIG_PWM_OMAP_DMTIMER is not set
 CONFIG_PWM_PCA9685=m
-# CONFIG_PWM_RASPBERRYPI_POE is not set
+CONFIG_PWM_RASPBERRYPI_POE=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 # CONFIG_PWM_STM32 is not set
@ -6660,7 +6660,7 @@ CONFIG_SND_SOC_FSL_EASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_FSL_MQS=m
-# CONFIG_SND_SOC_FSL_RPMSG is not set
+CONFIG_SND_SOC_FSL_RPMSG=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
@ -6673,11 +6673,13 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ICS43432=m
 # CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_IMX_AUDIO_RPMSG=m
 CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 CONFIG_SND_SOC_IMX_HDMI=m
-# CONFIG_SND_SOC_IMX_RPMSG is not set
+CONFIG_SND_SOC_IMX_PCM_RPMSG=m
+CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@ -8400,7 +8402,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_WQ_WATCHDOG=y
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@ -8438,7 +8441,7 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
+CONFIG_XILINX_INTC=y
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -30,7 +30,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -2747,7 +2746,7 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
+CONFIG_IIO_SCMI=m
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3877,6 +3876,7 @@ CONFIG_MFD_WM8994=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 CONFIG_MICREL_KS8995MA=m
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -4009,7 +4009,7 @@ CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMC=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -5344,7 +5344,7 @@ CONFIG_PWM_IMX_TPM=m
 CONFIG_PWM_MESON=m
 # CONFIG_PWM_OMAP_DMTIMER is not set
 CONFIG_PWM_PCA9685=m
-# CONFIG_PWM_RASPBERRYPI_POE is not set
+CONFIG_PWM_RASPBERRYPI_POE=m
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SAMSUNG=m
 # CONFIG_PWM_STM32 is not set
@ -6637,7 +6637,7 @@ CONFIG_SND_SOC_FSL_EASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_MICFIL=m
 CONFIG_SND_SOC_FSL_MQS=m
-# CONFIG_SND_SOC_FSL_RPMSG is not set
+CONFIG_SND_SOC_FSL_RPMSG=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
 CONFIG_SND_SOC_FSL_SSI=m
@ -6650,11 +6650,13 @@ CONFIG_SND_SOC_HDAC_HDMI=m
 CONFIG_SND_SOC_HDMI_CODEC=m
 CONFIG_SND_SOC_ICS43432=m
 # CONFIG_SND_SOC_IMG is not set
+CONFIG_SND_SOC_IMX_AUDIO_RPMSG=m
 CONFIG_SND_SOC_IMX_AUDMIX=m
 CONFIG_SND_SOC_IMX_AUDMUX=m
 # CONFIG_SND_SOC_IMX_ES8328 is not set
 CONFIG_SND_SOC_IMX_HDMI=m
-# CONFIG_SND_SOC_IMX_RPMSG is not set
+CONFIG_SND_SOC_IMX_PCM_RPMSG=m
+CONFIG_SND_SOC_IMX_RPMSG=m
 CONFIG_SND_SOC_IMX_SGTL5000=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 # CONFIG_SND_SOC_INNO_RK3036 is not set
@ -8376,7 +8378,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
@ -8413,7 +8416,7 @@ CONFIG_XFS_SUPPORT_V4=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
+CONFIG_XILINX_INTC=y
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@ -30,7 +30,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -1917,7 +1916,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_NEW_DEV_NODE is not set
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC is not set
@ -2455,7 +2453,6 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3562,6 +3559,7 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -3678,7 +3676,7 @@ CONFIG_MMC_WBSD=m
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_MMIOTRACE=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -4910,7 +4908,6 @@ CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RASPBERRYPI_POE is not set
 CONFIG_PWM=y
 CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m
@ -6042,7 +6039,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_RPMSG is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@ -6143,7 +6139,6 @@ CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
-CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@ -7543,7 +7538,8 @@ CONFIG_WLCORE_SPI=m
 CONFIG_WMI_BMOF=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_WQ_WATCHDOG=y
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_32_IRIS=m
@ -7667,7 +7663,6 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@ -30,7 +30,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -1900,7 +1899,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_NEW_DEV_NODE is not set
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC is not set
@ -2438,7 +2436,6 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3540,6 +3537,7 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -3656,7 +3654,7 @@ CONFIG_MMC_WBSD=m
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_MMIOTRACE=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -4888,7 +4886,6 @@ CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RASPBERRYPI_POE is not set
 CONFIG_PWM=y
 CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m
@ -6019,7 +6016,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_RPMSG is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@ -6120,7 +6116,6 @@ CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
-CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@ -7519,7 +7514,8 @@ CONFIG_WLCORE_SPI=m
 CONFIG_WMI_BMOF=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_32_IRIS=m
@ -7642,7 +7638,6 @@ CONFIG_XFS_SUPPORT_V4=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@ -29,7 +29,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -1785,7 +1784,6 @@ CONFIG_FSI_MASTER_HUB=m
 CONFIG_FSI_OCC=m
 CONFIG_FSI_SBEFIFO=m
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC is not set
@ -2281,7 +2279,6 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3312,6 +3309,7 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -3419,7 +3417,7 @@ CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -4600,7 +4598,6 @@ CONFIG_PWM_DWC=m
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_HIBVT=m
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RASPBERRYPI_POE is not set
 CONFIG_PWM=y
 CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m
@ -5709,7 +5706,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_RPMSG is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 CONFIG_SND_SOC_INTEL_CATPT=m
@ -5774,7 +5770,6 @@ CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
-CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@ -7114,7 +7109,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_WQ_WATCHDOG=y
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@ -7151,7 +7147,6 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_EMACLITE is not set
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -12,7 +12,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_842_DECOMPRESS=y
 # CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACORN_PARTITION is not set
@ -3096,7 +3095,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMC_WBSD is not set
 CONFIG_MMIOTRACE=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@ -29,7 +29,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -1768,7 +1767,6 @@ CONFIG_FSI_MASTER_HUB=m
 CONFIG_FSI_OCC=m
 CONFIG_FSI_SBEFIFO=m
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC is not set
@ -2264,7 +2262,6 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3289,6 +3286,7 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -3396,7 +3394,7 @@ CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -4577,7 +4575,6 @@ CONFIG_PWM_DWC=m
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_HIBVT=m
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RASPBERRYPI_POE is not set
 CONFIG_PWM=y
 CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m
@ -5685,7 +5682,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_RPMSG is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 CONFIG_SND_SOC_INTEL_CATPT=m
@ -5750,7 +5746,6 @@ CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
-CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@ -7089,7 +7084,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
@ -7125,7 +7121,6 @@ CONFIG_XFS_SUPPORT_V4=y
 # CONFIG_XILINX_DMA is not set
 # CONFIG_XILINX_EMACLITE is not set
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -12,7 +12,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_842_DECOMPRESS=y
 # CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACORN_PARTITION is not set
@ -3079,7 +3078,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMC_WBSD is not set
 # CONFIG_MMIOTRACE is not set
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -30,7 +30,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -1787,7 +1786,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_NEW_DEV_NODE is not set
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC is not set
@ -2263,7 +2261,6 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3288,6 +3285,7 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -3394,7 +3392,7 @@ CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -4529,7 +4527,6 @@ CONFIG_PWM_DWC=m
 CONFIG_PWM_HIBVT=m
 # CONFIG_PWM is not set
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RASPBERRYPI_POE is not set
 CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
@ -5653,7 +5650,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_RPMSG is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 CONFIG_SND_SOC_INTEL_CATPT=m
@ -5718,7 +5714,6 @@ CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
-CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@ -7059,7 +7054,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_WQ_WATCHDOG=y
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
@ -7096,7 +7092,6 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -11,7 +11,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACORN_PARTITION is not set
@ -3072,7 +3071,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMC_WBSD is not set
 CONFIG_MMIOTRACE=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -30,7 +30,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -1770,7 +1769,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_NEW_DEV_NODE is not set
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC is not set
@ -2246,7 +2244,6 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
 CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3265,6 +3262,7 @@ CONFIG_MFD_SYSCON=y
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -3371,7 +3369,7 @@ CONFIG_MMC_VIA_SDMMC=m
 CONFIG_MMC_VUB300=m
 CONFIG_MMC_WBSD=m
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -4506,7 +4504,6 @@ CONFIG_PWM_DWC=m
 CONFIG_PWM_HIBVT=m
 # CONFIG_PWM is not set
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RASPBERRYPI_POE is not set
 CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m
 CONFIG_PWRSEQ_SIMPLE=m
@ -5629,7 +5626,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_RPMSG is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH is not set
 CONFIG_SND_SOC_INTEL_CATPT=m
@ -5694,7 +5690,6 @@ CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
-CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@ -7034,7 +7029,8 @@ CONFIG_WLCORE_SDIO=m
 CONFIG_WLCORE_SPI=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 # CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
@ -7070,7 +7066,6 @@ CONFIG_XFS_SUPPORT_V4=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -11,7 +11,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACORN_PARTITION is not set
@ -3055,7 +3054,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMC_WBSD is not set
 # CONFIG_MMIOTRACE is not set
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -11,7 +11,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACER_WIRELESS is not set
 # CONFIG_ACORN_PARTITION is not set
@ -3075,7 +3074,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMC_WBSD is not set
 # CONFIG_MMIOTRACE is not set
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -31,7 +31,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -1958,7 +1957,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_NEW_DEV_NODE is not set
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC is not set
@ -2499,7 +2497,6 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3612,6 +3609,7 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -3726,7 +3724,7 @@ CONFIG_MMC_WBSD=m
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_MMIOTRACE=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -4951,7 +4949,6 @@ CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RASPBERRYPI_POE is not set
 CONFIG_PWM=y
 CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m
@ -6092,7 +6089,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_RPMSG is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@ -6193,7 +6189,6 @@ CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
-CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@ -7601,7 +7596,8 @@ CONFIG_WLCORE_SPI=m
 CONFIG_WMI_BMOF=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 CONFIG_WQ_WATCHDOG=y
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_5LEVEL=y
@ -7721,7 +7717,6 @@ CONFIG_XFS_WARN=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -11,7 +11,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACERHDF is not set
 # CONFIG_ACER_WIRELESS is not set
@ -3272,7 +3271,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_MMIOTRACE=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -31,7 +31,6 @@ CONFIG_9P_FS_POSIX_ACL=y
 CONFIG_9P_FS_SECURITY=y
 CONFIG_A11Y_BRAILLE_CONSOLE=y
 CONFIG_ABP060MG=m
-# CONFIG_ABX500_CORE is not set
 CONFIG_ACCESSIBILITY=y
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
@ -1941,7 +1940,6 @@ CONFIG_FSI_MASTER_HUB=m
 # CONFIG_FSI_NEW_DEV_NODE is not set
 # CONFIG_FSI_SBEFIFO is not set
 CONFIG_FSI_SCOM=m
-# CONFIG_FSL_DPAA2_SWITCH is not set
 # CONFIG_FSL_EDMA is not set
 # CONFIG_FSL_ENETC_IERB is not set
 # CONFIG_FSL_ENETC is not set
@ -2482,7 +2480,6 @@ CONFIG_IIO_KFIFO_BUF=m
 CONFIG_IIO=m
 CONFIG_IIO_MUX=m
 CONFIG_IIO_RESCALE=m
-# CONFIG_IIO_SCMI is not set
 # CONFIG_IIO_SIMPLE_DUMMY is not set
 # CONFIG_IIO_SSP_SENSORHUB is not set
 CONFIG_IIO_ST_ACCEL_3AXIS=m
@ -3590,6 +3587,7 @@ CONFIG_MFD_WL1273_CORE=m
 CONFIG_MHI_BUS=m
 CONFIG_MHI_BUS_PCI_GENERIC=m
 CONFIG_MHI_NET=m
+CONFIG_MHI_WWAN_CTRL=m
 # CONFIG_MICREL_KS8995MA is not set
 CONFIG_MICREL_PHY=m
 CONFIG_MICROCHIP_PHY=m
@ -3704,7 +3702,7 @@ CONFIG_MMC_WBSD=m
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_MMIOTRACE=y
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
@ -4929,7 +4927,6 @@ CONFIG_PWM_LPSS=m
 CONFIG_PWM_LPSS_PCI=m
 CONFIG_PWM_LPSS_PLATFORM=m
 # CONFIG_PWM_PCA9685 is not set
-# CONFIG_PWM_RASPBERRYPI_POE is not set
 CONFIG_PWM=y
 CONFIG_PWRSEQ_EMMC=m
 CONFIG_PWRSEQ_SD8787=m
@ -6069,7 +6066,6 @@ CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
-# CONFIG_SND_SOC_IMX_RPMSG is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
@ -6170,7 +6166,6 @@ CONFIG_SND_SOC_RT711_SDW=m
 CONFIG_SND_SOC_RT715_SDCA_SDW=m
 CONFIG_SND_SOC_RT715_SDW=m
 # CONFIG_SND_SOC_SAMSUNG_ARIES_WM8994 is not set
-CONFIG_SND_SOC_SAMSUNG_MIDAS_WM1811=m
 # CONFIG_SND_SOC_SC7180 is not set
 # CONFIG_SND_SOC_SGTL5000 is not set
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@ -7577,7 +7572,8 @@ CONFIG_WLCORE_SPI=m
 CONFIG_WMI_BMOF=m
 # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
 # CONFIG_WQ_WATCHDOG is not set
-# CONFIG_WWAN is not set
+CONFIG_WWAN_CORE=m
+CONFIG_WWAN=y
 # CONFIG_WW_MUTEX_SELFTEST is not set
 # CONFIG_X25 is not set
 CONFIG_X86_5LEVEL=y
@ -7696,7 +7692,6 @@ CONFIG_XFS_SUPPORT_V4=y
 # CONFIG_XILINX_DMA is not set
 CONFIG_XILINX_EMACLITE=m
 CONFIG_XILINX_GMII2RGMII=m
-# CONFIG_XILINX_INTC is not set
 CONFIG_XILINX_LL_TEMAC=m
 CONFIG_XILINX_PR_DECOUPLER=m
 # CONFIG_XILINX_SDFEC is not set
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -11,7 +11,6 @@ CONFIG_8139TOO=m
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 # CONFIG_ABP060MG is not set
-# CONFIG_ABX500_CORE is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_ACERHDF is not set
 # CONFIG_ACER_WIRELESS is not set
@ -3253,7 +3252,7 @@ CONFIG_MMC_VUB300=m
 # CONFIG_MMIOTRACE is not set
 # CONFIG_MMIOTRACE_TEST is not set
 CONFIG_MMU=y
-CONFIG_MODPROBE_PATH="/sbin/modprobe"
+CONFIG_MODPROBE_PATH="/usr/sbin/modprobe"
 # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
 # CONFIG_MODULE_COMPRESS_GZIP is not set
 # CONFIG_MODULE_COMPRESS is not set
--- a/kernel.spec
+++ b/kernel.spec
@ -66,7 +66,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0

-%global distro_build 0.rc0.20210507gita48b0872e694.10
+%global distro_build 0.rc1.13

 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@ -107,13 +107,13 @@ Summary: The Linux kernel
 %endif

 %define rpmversion 5.13.0
-%define pkgrelease 0.rc0.20210507gita48b0872e694.10
+%define pkgrelease 0.rc1.13

 # This is needed to do merge window version magic
 %define patchlevel 13

 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20210507gita48b0872e694.10%{?buildid}%{?dist}
+%define specrelease 0.rc1.13%{?buildid}%{?dist}

 %define pkg_release %{specrelease}

@ -203,7 +203,7 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 1 for production (build separate debug kernels)
 #  and 0 for rawhide (all kernels are debug kernels).
 # See also 'make debug' and 'make release'.
-%define debugbuildsenabled 0
+%define debugbuildsenabled 1

 # The kernel tarball/base version
 %define kversion 5.13
@ -618,7 +618,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.12-14712-ga48b0872e694.tar.xz
+Source0: linux-5.13-rc1.tar.xz

 Source1: Makefile.rhelver

@ -731,7 +731,6 @@ Source50: kernel-x86_64-debug-fedora.config
 Source51: generate_all_configs.sh

 Source52: process_configs.sh
-Source53: generate_bls_conf.sh
 Source56: update_scripts.sh

 Source54: mod-internal.list
@ -766,6 +765,7 @@ Source3001: kernel-local
 Source3003: Patchlist.changelog

 Source4000: README.rst
+Source4001: rpminspect.yaml

 ## Patches needed for building this package

@ -1269,8 +1269,8 @@ ApplyOptionalPatch()
  fi
 }

-%setup -q -n kernel-5.12-14712-ga48b0872e694 -c
-mv linux-5.12-14712-ga48b0872e694 linux-%{KVERREL}
+%setup -q -n kernel-5.13-rc1 -c
+mv linux-5.13-rc1 linux-%{KVERREL}

 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@ -1979,9 +1979,6 @@ BuildKernel() {
    # prune junk from kernel-devel
    find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -delete

-    # build a BLS config for this kernel
-    %{SOURCE53} "$KernelVer" "$RPM_BUILD_ROOT" "%{?variant}"
-
    # Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel
    mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer
    %ifarch x86_64 aarch64
@ -2731,7 +2728,6 @@ fi
 /lib/modules/%{KVERREL}%{?3:+%{3}}/build\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/source\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/updates\
-/lib/modules/%{KVERREL}%{?3:+%{3}}/bls.conf\
 /lib/modules/%{KVERREL}%{?3:+%{3}}/weak-updates\
 %{_datadir}/doc/kernel-keys/%{KVERREL}%{?3:+%{3}}\
 %if %{1}\
@ -2779,6 +2775,20 @@ fi
 #
 #
 %changelog
+* Mon May 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc1.13]
+- Remove unused boot loader specification files (David Ward)
+
+* Mon May 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc1.12]
+- Revert "Merge branch 'fix-tag-check' into 'os-build'" (Justin Forbes)
+- Enable CONFIG_DRM_AMDGPU_USERPTR for everyone (Justin M. Forbes)
+- redhat: add initial rpminspect configuration (Herton R. Krzesinski)
+
+* Sat May 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc0.20210507gita48b0872e694.11]
+- fedora: arm updates for 5.13 (Peter Robinson)
+- fedora: Enable WWAN and associated MHI bits (Peter Robinson)
+- Update CONFIG_MODPROBE_PATH to /usr/sbin (Justin Forbes)
+- Fedora set modprobe path (Justin M. Forbes)
+
 * Fri May 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc0.20210507gita48b0872e694.10]
 - Keep sctp and l2tp modules in modules-extra (Don Zickus)
 - Fix ppc64le cross build packaging (Don Zickus)
--- a/patch-5.13.0-redhat.patch
+++ b/patch-5.13.0-redhat.patch
@ -30,7 +30,7 @@
 drivers/net/ethernet/intel/ice/ice_main.c          |   1 +
 drivers/net/wireguard/main.c                       |   7 +
 drivers/nvme/host/core.c                           |  22 +-
- drivers/nvme/host/multipath.c                      |  18 +-
+ drivers/nvme/host/multipath.c                      |  20 +-
 drivers/nvme/host/nvme.h                           |   4 +
 drivers/pci/pci-driver.c                           |  29 ++
 drivers/pci/quirks.c                               |  24 ++
@ -66,7 +66,7 @@
 security/lockdown/Kconfig                          |  13 +
 security/lockdown/lockdown.c                       |   1 +
 security/security.c                                |   6 +
- 68 files changed, 1200 insertions(+), 186 deletions(-)
+ 68 files changed, 1201 insertions(+), 187 deletions(-)

 diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
 index 75a9dd98e76e..3ff3291551f9 100644
@ -91,10 +91,10 @@ index 75a9dd98e76e..3ff3291551f9 100644

 Boot into System Kernel
 diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
-index a816935d23d4..3037285ebb3b 100644
+index cb89dbdedc46..3d033c0b69f9 100644
 --- a/Documentation/admin-guide/kernel-parameters.txt
 +++ b/Documentation/admin-guide/kernel-parameters.txt
-@@ -5762,6 +5762,14 @@
+@@ -5764,6 +5764,14 @@
 	unknown_nmi_panic
 			[X86] Cause panic on unknown NMI.

@ -143,7 +143,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index 72af8e423f11..5295f99d5c92 100644
+index 53d09c414635..583c3a3510b9 100644
 --- a/Makefile
 +++ b/Makefile
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@ -157,7 +157,7 @@ index 72af8e423f11..5295f99d5c92 100644
 # We are using a recursive build, so we need to do a little thinking
 # to get the ordering right.
 #
-@@ -508,6 +512,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
+@@ -503,6 +507,7 @@ KBUILD_AFLAGS   := -D__ASSEMBLY__ -fno-PIE
 KBUILD_CFLAGS   := -Wall -Wundef -Werror=strict-prototypes -Wno-trigraphs \
 		   -fno-strict-aliasing -fno-common -fshort-wchar -fno-PIE \
 		   -Werror=implicit-function-declaration -Werror=implicit-int \
@ -165,7 +165,7 @@ index 72af8e423f11..5295f99d5c92 100644
 		   -Werror=return-type -Wno-format-security \
 		   -std=gnu89
 KBUILD_CPPFLAGS := -D__KERNEL__
-@@ -1292,7 +1297,13 @@ define filechk_version.h
+@@ -1291,7 +1296,13 @@ define filechk_version.h
 	((c) > 255 ? 255 : (c)))';                                       \
 	echo \#define LINUX_VERSION_MAJOR $(VERSION);                    \
 	echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL);            \
@ -197,10 +197,10 @@ index 24804f11302d..fd5ff3fa0d5b 100644
 	  The VM uses one page of physical memory for each page table.
 	  For systems with a lot of processes, this can use a lot of
 diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index f0b17d758912..c913235275a1 100644
+index 9f1d8566bbf9..ebb24a713210 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
-@@ -922,7 +922,7 @@ endchoice
+@@ -921,7 +921,7 @@ endchoice

 config ARM64_FORCE_52BIT
 	bool "Force 52-bit virtual addresses for userspace"
@ -209,7 +209,7 @@ index f0b17d758912..c913235275a1 100644
 	help
 	  For systems with 52-bit userspace VAs enabled, the kernel will attempt
 	  to maintain compatibility with older software by providing 48-bit VAs
-@@ -1174,6 +1174,7 @@ config XEN
+@@ -1165,6 +1165,7 @@ config XEN
 config FORCE_MAX_ZONEORDER
 	int
 	default "14" if ARM64_64K_PAGES
@ -281,7 +281,7 @@ index 5aab59ad5688..c53572b81c37 100644
 	/* boot_command_line has been already set up in early.c */
 	*cmdline_p = boot_command_line;
 diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
-index 6bdb69a9a7dc..1001dd85a984 100644
+index a1b756c49a93..e8992590d603 100644
 --- a/arch/x86/kernel/cpu/common.c
 +++ b/arch/x86/kernel/cpu/common.c
@@ -1308,6 +1308,7 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c)
@ -427,10 +427,10 @@ index 277f00b288d1..adbce15c273d 100644
 	for (i = 0; i < hest_tab->error_source_count; i++) {
 		len = hest_esrc_len(hest_hdr);
 diff --git a/drivers/acpi/irq.c b/drivers/acpi/irq.c
-index e209081d644b..7484bcf59a1b 100644
+index c68e694fca26..146cba5ae5bc 100644
 --- a/drivers/acpi/irq.c
 +++ b/drivers/acpi/irq.c
-@@ -126,6 +126,7 @@ struct acpi_irq_parse_one_ctx {
+@@ -130,6 +130,7 @@ struct acpi_irq_parse_one_ctx {
 	unsigned int index;
 	unsigned long *res_flags;
 	struct irq_fwspec *fwspec;
@ -438,7 +438,7 @@ index e209081d644b..7484bcf59a1b 100644
 };

 /**
-@@ -197,7 +198,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
+@@ -201,7 +202,8 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
 		return AE_CTRL_TERMINATE;
 	case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
 		eirq = &ares->data.extended_irq;
@ -448,7 +448,7 @@ index e209081d644b..7484bcf59a1b 100644
 			return AE_OK;
 		if (ctx->index >= eirq->interrupt_count) {
 			ctx->index -= eirq->interrupt_count;
-@@ -232,8 +234,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
+@@ -236,8 +238,19 @@ static acpi_status acpi_irq_parse_one_cb(struct acpi_resource *ares,
 static int acpi_irq_parse_one(acpi_handle handle, unsigned int index,
 			      struct irq_fwspec *fwspec, unsigned long *flags)
 {
@ -1291,7 +1291,7 @@ index 7a7d5f1a80fc..de28e2633761 100644

 err_netlink:
 diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index b6f7815fa239..c2f177efe312 100644
+index 522c9b229f80..3161fec27575 100644
 --- a/drivers/nvme/host/core.c
 +++ b/drivers/nvme/host/core.c
@@ -241,6 +241,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@ -1358,7 +1358,7 @@ index b6f7815fa239..c2f177efe312 100644
 }
 EXPORT_SYMBOL_GPL(nvme_complete_rq);
 diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c
-index 0d0de3433f37..44b745bed521 100644
+index 0551796517e6..e64ab1be5765 100644
 --- a/drivers/nvme/host/multipath.c
 +++ b/drivers/nvme/host/multipath.c
@@ -8,7 +8,11 @@
@ -1373,7 +1373,7 @@ index 0d0de3433f37..44b745bed521 100644
 module_param(multipath, bool, 0444);
 MODULE_PARM_DESC(multipath,
 	"turn on native support for multiple controllers per subsystem");
-@@ -65,13 +69,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
+@@ -65,14 +69,10 @@ bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags)
 	return true;
 }

@ -1383,12 +1383,13 @@ index 0d0de3433f37..44b745bed521 100644
 	struct nvme_ns *ns = req->q->queuedata;
 	u16 status = nvme_req(req)->status & 0x7ff;
 -	unsigned long flags;
+-	struct bio *bio;
 -
 -	nvme_mpath_clear_current_path(ns);

 	/*
 	 * If we got back an ANA error, we know the controller is alive but not
-@@ -82,6 +83,15 @@ void nvme_failover_req(struct request *req)
+@@ -83,6 +83,16 @@ void nvme_failover_req(struct request *req)
 		set_bit(NVME_NS_ANA_PENDING, &ns->flags);
 		queue_work(nvme_wq, &ns->ctrl->ana_work);
 	}
@ -1398,17 +1399,18 @@ index 0d0de3433f37..44b745bed521 100644
 +{
 +	struct nvme_ns *ns = req->q->queuedata;
 +	unsigned long flags;
+	struct bio *bio;
 +
 +	nvme_mpath_clear_current_path(ns);
 +	nvme_update_ana(req);

 	spin_lock_irqsave(&ns->head->requeue_lock, flags);
- 	blk_steal_bios(&ns->head->requeue_list, req);
+ 	for (bio = req->bio; bio; bio = bio->bi_next)
 diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index 773dde5b231d..31bba9c1ce70 100644
+index 05f31a2c64bb..401a93cfffde 100644
 --- a/drivers/nvme/host/nvme.h
 +++ b/drivers/nvme/host/nvme.h
-@@ -694,6 +694,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
+@@ -708,6 +708,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);
 void nvme_mpath_start_freeze(struct nvme_subsystem *subsys);
 bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name, int *flags);
 void nvme_failover_req(struct request *req);
@ -1416,7 +1418,7 @@ index 773dde5b231d..31bba9c1ce70 100644
 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl);
 int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head);
 void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id);
-@@ -738,6 +739,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name,
+@@ -752,6 +753,9 @@ static inline bool nvme_mpath_set_disk_name(struct nvme_ns *ns, char *disk_name,
 static inline void nvme_failover_req(struct request *req)
 {
 }
@ -1706,10 +1708,10 @@ index d00aca3c77ce..ecc3aee57c3d 100644
 	{ MPI2_MFGPAGE_VENDORID_LSI, MPI25_MFGPAGE_DEVID_SAS3004,
 		PCI_ANY_ID, PCI_ANY_ID },
 diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
-index d74c32f84ef5..b7c38e7a5bfc 100644
+index 4eab564ea6a0..f2d360667273 100644
 --- a/drivers/scsi/qla2xxx/qla_os.c
 +++ b/drivers/scsi/qla2xxx/qla_os.c
-@@ -7742,6 +7742,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
+@@ -7743,6 +7743,7 @@ static const struct pci_error_handlers qla2xxx_err_handler = {
 };

 static struct pci_device_id qla2xxx_pci_tbl[] = {
@ -1717,7 +1719,7 @@ index d74c32f84ef5..b7c38e7a5bfc 100644
 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2100) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2200) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP2300) },
-@@ -7754,13 +7755,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
+@@ -7755,13 +7756,18 @@ static struct pci_device_id qla2xxx_pci_tbl[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP8432) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5422) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_QLOGIC_ISP5432) },
@ -1877,10 +1879,10 @@ index 6b5d36babfcc..fd4a5d66a9d0 100644
 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var)
 {
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
-index 09035ac67d4b..acc5fd8ba845 100644
+index 15d8bad3d2f2..5cc175748767 100644
 --- a/include/linux/kernel.h
 +++ b/include/linux/kernel.h
-@@ -451,7 +451,24 @@ extern enum system_states {
+@@ -453,7 +453,24 @@ extern enum system_states {
 #define TAINT_LIVEPATCH			15
 #define TAINT_AUX			16
 #define TAINT_RANDSTRUCT		17
@ -1906,7 +1908,7 @@ index 09035ac67d4b..acc5fd8ba845 100644
 #define TAINT_FLAGS_MAX			((1UL << TAINT_FLAGS_COUNT) - 1)

 struct taint_flag {
-@@ -737,4 +754,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
+@@ -739,4 +756,19 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
 	 /* OTHER_WRITABLE?  Generally considered a bad idea. */		\
 	 BUILD_BUG_ON_ZERO((perms) & 2) +					\
 	 (perms))
@ -2322,7 +2324,7 @@ index 06f7c50ce77f..09ed686ac5e6 100644

 #if defined(CONFIG_SECURITY) && defined(CONFIG_WATCH_QUEUE)
 diff --git a/kernel/Makefile b/kernel/Makefile
-index e8a6715f38dc..f92f94ce57aa 100644
+index 4df609be42d0..4ef0c0f6a8f4 100644
 --- a/kernel/Makefile
 +++ b/kernel/Makefile
@@ -12,6 +12,7 @@ obj-y     = fork.o exec_domain.o panic.o \
@ -2654,7 +2656,7 @@ index 3e623ccc020b..3047abc9a507 100644
 		sprintf(fname, "%s.mod.c", mod->name);
 		write_if_changed(&buf, fname);
 diff --git a/scripts/tags.sh b/scripts/tags.sh
-index fd96734deff1..5b540f3dcff1 100755
+index db8ba411860a..2294fb0f17a9 100755
 --- a/scripts/tags.sh
 +++ b/scripts/tags.sh
@@ -16,6 +16,8 @@ fi
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@ -0,0 +1,10 @@
+# additional rpminspect configuration for this branch
+
+---
+emptyrpm:
+    expected_empty:
+        - kernel
+        - kernel-debug
+        - kernel-lpae
+        - kernel-zfcpdump
+        - kernel-zfcpdump-modules
--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.12-14712-ga48b0872e694.tar.xz) = cf573cd6b095cfbfdd9bf67f6759ab146540b52c78636226fe42c69faadd21b29cf4394a52451ae97451bb5f8e884153a0005d120ba7ed8d7114c1494b35d24f
-SHA512 (kernel-abi-whitelists-5.13.0-0.rc0.20210507gita48b0872e694.10.tar.bz2) = 9ff777cce5eeaf79e98f85bb4820ebe82b3ee4f420b80a00e9ad6cdb9c335be3e4f0234a2fe24a8bff0c2733f7c4a58ee7c1664e492b98f1c9e2d41774814459
-SHA512 (kernel-kabi-dw-5.13.0-0.rc0.20210507gita48b0872e694.10.tar.bz2) = 87c6d5e37084dd3cb0e1dfcbb366f23f1d21dd1d1ce370db5695032bd1b2e12a8864e0f88707b8672107a454ecf2d181f44c288a44cef8c535b0505fa73b2c19
+SHA512 (linux-5.13-rc1.tar.xz) = aa47d04c45bddbf69d1fe15e660cbf0568d8311536062a5fff81d201aa8041e78196d6ccb257acf65c3a317a2e131b12e49f18ddd08ffb8f169746144bff0ffc
+SHA512 (kernel-abi-whitelists-5.13.0-0.rc1.13.tar.bz2) = 24ae299a24f21beee89dbd26ea9a3339852356ee53f6801781bf10a217fedbe66a326ff777bb392c19f32b7c0755ffecf5faa8b11eaed6d6a0eaf1433f5a529c
+SHA512 (kernel-kabi-dw-5.13.0-0.rc1.13.tar.bz2) = 741b026ae3a0d645b9a16cad5bf4447acef522a0b957816c2213c6c6cc6d64d936cec6ca6ed65a4beb23b73ca1fb69a2cca0334a1be0109893559b66990500c0