Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc1.162.vanilla.1.fc35kernel-5.12.0-0.rc1.162.vanilla.1.fc34kernel-5.12.0-0.rc1.162.vanilla.1.fc33kernel-5.12.0-0.rc1.162.vanilla.1.fc32

1 files changed, 13 insertions, 6 deletions

diff --git a/kernel.spec b/kernel.spec
index 640d410f4..c0cc14351 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -64,7 +64,7 @@ Summary: The Linux kernel
 # For a stable, released kernel, released_kernel should be 1.
 %global released_kernel 0
 
-%global distro_build 0.rc0.20210225gitc03c21ba6f4e.160
+%global distro_build 0.rc1.162
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -107,13 +107,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.12.0
-%define pkgrelease 0.rc0.20210225gitc03c21ba6f4e.160
+%define pkgrelease 0.rc1.162
 
 # This is needed to do merge window version magic
 %define patchlevel 12
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc0.20210225gitc03c21ba6f4e.160%{?buildid}%{?dist}
+%define specrelease 0.rc1.162%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -604,7 +604,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20210225gitc03c21ba6f4e.tar.xz
+Source0: linux-5.12-rc1.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1253,8 +1253,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20210225gitc03c21ba6f4e -c
-mv linux-20210225gitc03c21ba6f4e linux-%{KVERREL}
+%setup -q -n kernel-5.12-rc1 -c
+mv linux-5.12-rc1 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 # cp -a %{SOURCE1} .
@@ -2756,6 +2756,13 @@ fi
 #
 #
 %changelog
+* Mon Mar 01 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.0-0.rc1.162]
+- Fix merge issue (Justin M. Forbes)
+
+* Sat Feb 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc0.20210227gitc03c21ba6f4e.161]
+- Change the pending config for CONFIG_PPC_QUEUED_SPINLOCKS as it is now default upstream for 64-bit server CPUs (Justin M. Forbes)
+- Turn on CONFIG_PPC_QUEUED_SPINLOCKS as it is default upstream now (Justin M. Forbes)
+
 * Tue Feb 23 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc0.20210223git3b9cdafb5358.159]
 - Update pending-common configs to address new upstream config deps (Justin M. Forbes)
 - rpmspec: ship gpio-watch.debug in the proper debuginfo package (Herton R. Krzesinski)