Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc7.53.vanilla.1.fc36kernel-5.15.0-0.rc7.53.vanilla.1.fc35kernel-5.15.0-0.rc7.53.vanilla.1.fc34kernel-5.15.0-0.rc7.53.vanilla.1.fc33

1 files changed, 10 insertions, 6 deletions

diff --git a/kernel.spec b/kernel.spec
index 83c246f6c..5e88ad7f0 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,7 +85,7 @@ Summary: The Linux kernel
 #  the --with-release option overrides this setting.)
 %define debugbuildsenabled 1
 
-%global distro_build 0.rc6.20211021git2f111a6fd5b5.49
+%global distro_build 0.rc7.53
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -132,13 +132,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.15.0
 %define patchversion 5.15
-%define pkgrelease 0.rc6.20211021git2f111a6fd5b5.49
+%define pkgrelease 0.rc7.53
 
 # This is needed to do merge window version magic
 %define patchlevel 15
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20211021git2f111a6fd5b5.49%{?buildid}%{?dist}
+%define specrelease 0.rc7.53%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -684,7 +684,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.15-rc6-70-g2f111a6fd5b5.tar.xz
+Source0: linux-5.15-rc7.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1375,8 +1375,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.15-rc6-70-g2f111a6fd5b5 -c
-mv linux-5.15-rc6-70-g2f111a6fd5b5 linux-%{KVERREL}
+%setup -q -n kernel-5.15-rc7 -c
+mv linux-5.15-rc7 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2979,6 +2979,10 @@ fi
 #
 #
 %changelog
+* Tue Oct 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc7.53]
+- Enable CONFIG_FAIL_SUNRPC for debug builds (Justin M. Forbes)
+- fedora: Disable fbdev drivers and use simpledrm instead (Javier Martinez Canillas)
+
 * Thu Oct 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc6.20211021git2f111a6fd5b5.49]
 - Revert "bpf, selftests: Disable tests that need clang13" (Jiri Olsa)
 - spec: Don't fail spec build if ksamples fails (Jiri Olsa)