kernel-5.13.0-0.rc2.20210518git8ac91e6c6033.21

* Tue May 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc2.20210518git8ac91e6c6033.21]
- rpmspec: build debug-* meta-packages if debug builds are disabled (Herton R. Krzesinski)
Resolves: rhbz#

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

12 files changed, 104 insertions, 69 deletions

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 85efc4f45..165fd6828 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 = 19
+RHEL_RELEASE = 21
 
 #
 # Early y+1 numbering
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index 8979a8ce5..6cfc3fa39 100644
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@@ -1243,7 +1243,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1297,7 +1297,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 CONFIG_DRM_HISI_HIBMC=m
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -5954,16 +5954,16 @@ CONFIG_UEFI_CPER_ARM=y
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 1e48e78f8..3c11e5da1 100644
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@@ -1235,7 +1235,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1289,7 +1289,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 CONFIG_DRM_HISI_HIBMC=m
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -5931,16 +5931,16 @@ CONFIG_UEFI_CPER_ARM=y
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index 56a813716..e21b84e95 100644
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@@ -1104,7 +1104,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1158,7 +1158,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -5760,16 +5760,16 @@ CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index d020187e4..d62b11e48 100644
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@@ -1096,7 +1096,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1150,7 +1150,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -5741,16 +5741,16 @@ CONFIG_UDF_FS=m
 # CONFIG_UEVENT_HELPER is not set
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 131c6f477..697fcad2a 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -1109,7 +1109,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1163,7 +1163,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -5722,7 +5722,7 @@ CONFIG_UHID=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PCI_GENERIC is not set
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index fd0ff1dcc..589d2046d 100644
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@@ -1101,7 +1101,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1155,7 +1155,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -5703,7 +5703,7 @@ CONFIG_UHID=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PCI_GENERIC is not set
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 56066965c..822b5448e 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -1111,7 +1111,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1165,7 +1165,7 @@ CONFIG_DRM_DP_CEC=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GM12U320=m
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -5738,7 +5738,7 @@ CONFIG_UHID=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 # CONFIG_UIO_PCI_GENERIC is not set
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
 # CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index 72761a4e4..511f70ca5 100644
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@@ -1176,7 +1176,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1236,7 +1236,7 @@ CONFIG_DRM_GM12U320=m
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -4128,7 +4128,7 @@ CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 CONFIG_PINCTRL_ALDERLAKE=m
-CONFIG_PINCTRL_AMD=m
+CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CANNONLAKE=m
@@ -5995,17 +5995,17 @@ CONFIG_UDF_FS=m
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
 CONFIG_UID16=y
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO_HV_GENERIC=m
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index 3e5d055a9..4493f9770 100644
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@@ -1168,7 +1168,7 @@ CONFIG_DM_SWITCH=m
 CONFIG_DM_THIN_PROVISIONING=m
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_UNSTRIPED is not set
-# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DM_VERITY=m
 CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
 CONFIG_DM_WRITECACHE=m
@@ -1228,7 +1228,7 @@ CONFIG_DRM_GM12U320=m
 CONFIG_DRM_GMA3600=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
-# CONFIG_DRM_GUD is not set
+CONFIG_DRM_GUD=m
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_HISI_KIRIN is not set
@@ -4109,7 +4109,7 @@ CONFIG_PHYSICAL_START=0x1000000
 # CONFIG_PI433 is not set
 CONFIG_PID_NS=y
 CONFIG_PINCTRL_ALDERLAKE=m
-CONFIG_PINCTRL_AMD=m
+CONFIG_PINCTRL_AMD=y
 CONFIG_PINCTRL_BAYTRAIL=y
 CONFIG_PINCTRL_BROXTON=m
 CONFIG_PINCTRL_CANNONLAKE=m
@@ -5973,17 +5973,17 @@ CONFIG_UDF_FS=m
 # CONFIG_UFS_FS is not set
 CONFIG_UHID=m
 CONFIG_UID16=y
-CONFIG_UIO_AEC=m
-CONFIG_UIO_CIF=m
+# CONFIG_UIO_AEC is not set
+# CONFIG_UIO_CIF is not set
 # CONFIG_UIO_DMEM_GENIRQ is not set
 CONFIG_UIO_HV_GENERIC=m
 CONFIG_UIO=m
 # CONFIG_UIO_MF624 is not set
 # CONFIG_UIO_NETX is not set
 CONFIG_UIO_PCI_GENERIC=m
-CONFIG_UIO_PDRV_GENIRQ=m
+# CONFIG_UIO_PDRV_GENIRQ is not set
 # CONFIG_UIO_PRUSS is not set
-CONFIG_UIO_SERCOS3=m
+# CONFIG_UIO_SERCOS3 is not set
 # CONFIG_ULTRIX_PARTITION is not set
 # CONFIG_UNICODE is not set
 # CONFIG_UNISYSSPAR is not set
diff --git a/kernel.spec b/kernel.spec
index 4c27fabdc..db5beab16 100755
--- 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.rc2.19
+%global distro_build 0.rc2.20210518git8ac91e6c6033.21
 
 %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.rc2.19
+%define pkgrelease 0.rc2.20210518git8ac91e6c6033.21
 
 # This is needed to do merge window version magic
 %define patchlevel 13
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc2.19%{?buildid}%{?dist}
+%define specrelease 0.rc2.20210518git8ac91e6c6033.21%{?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 1
+%define debugbuildsenabled 0
 
 # The kernel tarball/base version
 %define kversion 5.13
@@ -542,6 +542,7 @@ BuildRequires: zlib-devel binutils-devel newt-devel perl(ExtUtils::Embed) bison
 BuildRequires: audit-libs-devel
 BuildRequires: java-devel
 BuildRequires: libbpf-devel
+BuildRequires: libbabeltrace-devel
 %ifnarch %{arm} s390x
 BuildRequires: numactl-devel
 %endif
@@ -619,7 +620,7 @@ BuildRequires: clang
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13-rc2.tar.xz
+Source0: linux-5.13-rc2-5-g8ac91e6c6033.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1039,9 +1040,9 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
 
 #
 # This macro creates a kernel-<subpackage>-devel package.
-#	%%kernel_devel_package <subpackage> <pretty-name>
+#	%%kernel_devel_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_devel_package() \
+%define kernel_devel_package(m) \
 %package %{?1:%{1}-}devel\
 Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
 Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
@@ -1058,6 +1059,9 @@ Requires: bison\
 Requires: flex\
 Requires: make\
 Requires: gcc\
+%if %{-m:1}%{!-m:0}\
+Requires: kernel-devel-uname-r = %{KVERREL}\
+%endif\
 %description %{?1:%{1}-}devel\
 This package provides kernel headers and makefiles sufficient to build modules\
 against the %{?2:%{2} }kernel package.\
@@ -1098,9 +1102,9 @@ This package provides kernel modules for the %{?2:%{2} }kernel package for Red H
 
 #
 # This macro creates a kernel-<subpackage>-modules-extra package.
-#	%%kernel_modules_extra_package <subpackage> <pretty-name>
+#	%%kernel_modules_extra_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_modules_extra_package() \
+%define kernel_modules_extra_package(m) \
 %package %{?1:%{1}-}modules-extra\
 Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
 Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\
@@ -1110,6 +1114,9 @@ Provides: installonlypkg(kernel-module)\
 Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\
 Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
 Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
+%if %{-m:1}%{!-m:0}\
+Requires: kernel-modules-extra-uname-r = %{KVERREL}\
+%endif\
 AutoReq: no\
 AutoProv: yes\
 %description %{?1:%{1}-}modules-extra\
@@ -1118,9 +1125,9 @@ This package provides less commonly used kernel modules for the %{?2:%{2} }kerne
 
 #
 # This macro creates a kernel-<subpackage>-modules package.
-#	%%kernel_modules_package <subpackage> <pretty-name>
+#	%%kernel_modules_package [-m] <subpackage> <pretty-name>
 #
-%define kernel_modules_package() \
+%define kernel_modules_package(m) \
 %package %{?1:%{1}-}modules\
 Summary: kernel modules to match the %{?2:%{2}-}core kernel\
 Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
@@ -1129,6 +1136,9 @@ Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\
 Provides: installonlypkg(kernel-module)\
 Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
 Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
+%if %{-m:1}%{!-m:0}\
+Requires: kernel-modules-uname-r = %{KVERREL}\
+%endif\
 AutoReq: no\
 AutoProv: yes\
 %description %{?1:%{1}-}modules\
@@ -1152,22 +1162,27 @@ The meta-package for the %{1} kernel\
 #
 # This macro creates a kernel-<subpackage> and its -devel and -debuginfo too.
 #	%%define variant_summary The Linux kernel compiled for <configuration>
-#	%%kernel_variant_package [-n <pretty-name>] <subpackage>
+#	%%kernel_variant_package [-n <pretty-name>] [-m] <subpackage>
 #
-%define kernel_variant_package(n:) \
+%define kernel_variant_package(n:m) \
 %package %{?1:%{1}-}core\
 Summary: %{variant_summary}\
 Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
 Provides: installonlypkg(kernel)\
+%if %{-m:1}%{!-m:0}\
+Requires: kernel-core-uname-r = %{KVERREL}\
+%endif\
 %{expand:%%kernel_reqprovconf}\
 %if %{?1:1} %{!?1:0} \
 %{expand:%%kernel_meta_package %{?1:%{1}}}\
 %endif\
-%{expand:%%kernel_devel_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%{expand:%%kernel_modules_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
-%{expand:%%kernel_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
+%{expand:%%kernel_devel_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%{expand:%%kernel_modules_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%{expand:%%kernel_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\
+%if %{-m:0}%{!-m:1}\
 %{expand:%%kernel_modules_internal_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\
 %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\
+%endif\
 %{nil}
 
 # Now, each variant package.
@@ -1190,7 +1205,11 @@ zfcpdump infrastructure.
 %endif
 
 %define variant_summary The Linux kernel compiled with extra debugging enabled
+%if !%{debugbuildsenabled}
+%kernel_variant_package -m debug
+%else
 %kernel_variant_package debug
+%endif
 %description debug-core
 The kernel package contains the Linux kernel (vmlinuz), the core of any
 Linux operating system.  The kernel handles the basic functions
@@ -1270,8 +1289,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.13-rc2 -c
-mv linux-5.13-rc2 linux-%{KVERREL}
+%setup -q -n kernel-5.13-rc2-5-g8ac91e6c6033 -c
+mv linux-5.13-rc2-5-g8ac91e6c6033 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@@ -2517,8 +2536,10 @@ fi\
 %kernel_variant_post -v lpae -r (kernel|kernel-smp)
 %endif
 
+%if %{with_debug}
 %kernel_variant_preun debug
 %kernel_variant_post -v debug
+%endif
 
 %if %{with_zfcpdump}
 %kernel_variant_preun zfcpdump
@@ -2743,6 +2764,13 @@ fi
 
 %kernel_variant_files %{_use_vdso} %{with_up}
 %kernel_variant_files %{_use_vdso} %{with_debug} debug
+%if !%{debugbuildsenabled}
+%files debug
+%files debug-core
+%files debug-devel
+%files debug-modules
+%files debug-modules-extra
+%endif
 %kernel_variant_files %{use_vdso} %{with_pae} lpae
 %kernel_variant_files %{_use_vdso} %{with_zfcpdump} zfcpdump
 
@@ -2764,6 +2792,13 @@ fi
 #
 #
 %changelog
+* Tue May 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc2.20210518git8ac91e6c6033.21]
+- rpmspec: build debug-* meta-packages if debug builds are disabled (Herton R. Krzesinski)
+
+* Tue May 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc2.20210518git8ac91e6c6033.20]
+- UIO: disable unused config options (Aristeu Rozanski) [1957819]
+- ARK-config: Make amd_pinctrl module builtin (Hans de Goede)
+
 * Mon May 17 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc2.19]
 - rpmspec: revert/drop content hash for kernel-headers (Herton R. Krzesinski)
 - rpmspec: fix check that calls InitBuildVars (Herton R. Krzesinski)
diff --git a/sources b/sources
index e57a9a09f..7fc5b964c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13-rc2.tar.xz) = 1a724d78029ca79a585125b3df649209f8c35a683b8f3a7b564558c53a28adb78926c23e3301ad440d7534cbb7f4c6e3be4d8833f4556bf480bd43112abb8f4a
-SHA512 (kernel-abi-whitelists-5.13.0-0.rc2.19.tar.bz2) = e99e3bda44b2729452b1960669ffd05d39740231d359c71d1d269c7bc4526cbcfdb58d3a657fc5be8740ccbb01f2d038366bf052379c968f002db112a219c1e1
-SHA512 (kernel-kabi-dw-5.13.0-0.rc2.19.tar.bz2) = eca3e751286b8e185f1bf3ccece75a5c0f34acc7e8464b626ca00ef34016c6ffbfbd2727071e1d400ee77b0afe44d9ba2deedb2a704cc827c03640265f87ff8f
+SHA512 (linux-5.13-rc2-5-g8ac91e6c6033.tar.xz) = 9d0fe8f822c03449183a38c950c7c7a9b7b0825b75d61984a6e463c019ffca8ced59f8d0cf3a9c66d527b97af537313b7b85e98c45ec21d8298829bec0d3e0a1
+SHA512 (kernel-abi-whitelists-5.13.0-0.rc2.20210518git8ac91e6c6033.21.tar.bz2) = 28a8ed0013d655b9111cd17b501ba66a993905a4d7271415f8fa8223c47eb1d5272d25d5ddb23b64b8519f03be3b114b507a4ef59222e42a18fb569abc071f2d
+SHA512 (kernel-kabi-dw-5.13.0-0.rc2.20210518git8ac91e6c6033.21.tar.bz2) = e34ce0e0db020105f8c54fa78571cfc2b6e02075586d5d4c10b8f4881aea2dfdb2a6b847830c79ced1b9b8bfe2e775a3247d2aa5e81173e3b4c4f851f972ebfc