Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-0.rc6.20211221git59b3f9448833.42.vanilla.1.fc35

1 files changed, 10 insertions, 7 deletions

diff --git a/kernel.spec b/kernel.spec
index 50d643e59..2cb8d4f15 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -85,9 +85,9 @@ Summary: The Linux kernel
 # Set debugbuildsenabled to 0 to not build a separate debug kernel, but
 #  to build the base kernel using the debug configuration. (Specifying
 #  the --with-release option overrides this setting.)
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
 
-%global distro_build 0.rc6.41
+%global distro_build 0.rc6.20211221git59b3f9448833.42
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -134,13 +134,13 @@ Summary: The Linux kernel
 
 %define rpmversion 5.16.0
 %define patchversion 5.16
-%define pkgrelease 0.rc6.41
+%define pkgrelease 0.rc6.20211221git59b3f9448833.42
 
 # This is needed to do merge window version magic
 %define patchlevel 16
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.41%{?buildid}%{?dist}
+%define specrelease 0.rc6.20211221git59b3f9448833.42%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -691,7 +691,7 @@ BuildRequires: lld
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.16-rc6.tar.xz
+Source0: linux-5.16-rc6-6-g59b3f9448833.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1385,8 +1385,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-5.16-rc6 -c
-mv linux-5.16-rc6 linux-%{KVERREL}
+%setup -q -n kernel-5.16-rc6-6-g59b3f9448833 -c
+mv linux-5.16-rc6-6-g59b3f9448833 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2987,6 +2987,9 @@ fi
 #
 #
 %changelog
+* Tue Dec 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.20211221git59b3f9448833.42]
+- Update rebase-notes with dracut 5.17 information (Justin M. Forbes)
+
 * Mon Dec 20 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc6.41]
 - redhat/configs: Enable CONFIG_CRYPTO_BLAKE2B (Neal Gompa) [2031547]