From d39973b4a653d7599750ea3bf0097993563848f3 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Sat, 6 Mar 2021 10:09:34 -0600
Subject: kernel-5.12.0-0.rc1.20210305git280d542f6ffa.164

* Fri Mar 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc1.20210305git280d542f6ffa.164]
- Revert "ARM: fix __get_user_check() in case uaccess_* calls are not inlined" (Herton R. Krzesinski)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 Makefile.rhelver          |  2 +-
 kernel.spec               | 14 +++++++-------
 patch-5.12.0-redhat.patch |  2 +-
 sources                   |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Makefile.rhelver b/Makefile.rhelver
index 103af565b..50f5b90a6 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 = 164
+RHEL_RELEASE = 165
 
 #
 # Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index 841fc1c73..18686b558 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.rc1.20210305git280d542f6ffa.164
+%global distro_build 0.rc2.165
 
 %if 0%{?fedora}
 %define secure_boot_arch x86_64
@@ -105,13 +105,13 @@ Summary: The Linux kernel
 %endif
 
 %define rpmversion 5.12.0
-%define pkgrelease 0.rc1.20210305git280d542f6ffa.164
+%define pkgrelease 0.rc2.165
 
 # This is needed to do merge window version magic
 %define patchlevel 12
 
 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20210305git280d542f6ffa.164%{?buildid}%{?dist}
+%define specrelease 0.rc2.165%{?buildid}%{?dist}
 
 %define pkg_release %{specrelease}
 
@@ -201,7 +201,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.12
@@ -602,7 +602,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20210305git280d542f6ffa.tar.xz
+Source0: linux-5.12-rc2.tar.xz
 
 Source1: Makefile.rhelver
 
@@ -1250,8 +1250,8 @@ ApplyOptionalPatch()
   fi
 }
 
-%setup -q -n kernel-20210305git280d542f6ffa -c
-mv linux-20210305git280d542f6ffa linux-%{KVERREL}
+%setup -q -n kernel-5.12-rc2 -c
+mv linux-5.12-rc2 linux-%{KVERREL}
 
 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
diff --git a/patch-5.12.0-redhat.patch b/patch-5.12.0-redhat.patch
index 8a0ad1f01..92c4767e4 100644
--- a/patch-5.12.0-redhat.patch
+++ b/patch-5.12.0-redhat.patch
@@ -139,7 +139,7 @@ index 000000000000..effb81d04bfd
 +
 +endmenu
 diff --git a/Makefile b/Makefile
-index f9b54da2fca0..e2333c46d848 100644
+index 31dcdb3d61fa..222043217b7e 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
diff --git a/sources b/sources
index 8571665e9..2cc4208a9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20210305git280d542f6ffa.tar.xz) = d70fcf39aaa6a3bd8dd6440267e0eff098c3f52c9f9a5b63f6ccfedaa777f509b0e43a8d428132a49294febe267162413321c3403a67576516b860a3a77b8477
-SHA512 (kernel-abi-whitelists-5.12.0-0.rc1.20210305git280d542f6ffa.164.tar.bz2) = 2036daf88ef618ed8cbd12071b7edf459c7603a0ca612331a53ed7f515035fbbf085892c92241a5bbb545ade5568437d17ccac9c5eb8ddbfde1f24f17bcbe696
-SHA512 (kernel-kabi-dw-5.12.0-0.rc1.20210305git280d542f6ffa.164.tar.bz2) = 31e98aa95db0484fdf7a50db2c4dd5075ecebe5ab2613267e70268e0ec68aae6209b7d4b8db03163c11f7452a10b659eede5d894f6dc3e7d04ea272aa7d731ac
+SHA512 (linux-5.12-rc2.tar.xz) = 34a8297ef79b2c8116b71e748bc52c92425b8479f26cb5d6b4b00c0d541ea57c1083ffed4f997f66bb44897db1f2409f8b9364acc96ec68b2e3e8c6bedcaffaf
+SHA512 (kernel-abi-whitelists-5.12.0-0.rc2.165.tar.bz2) = 0d71392f644297612560fe54595962f4f24642f67bb6f25a07f7112f478a807e8a5fe7af5d2d25c6566c5ef055d320518a6b2d2ab0f9f784a1f78eac3e144430
+SHA512 (kernel-kabi-dw-5.12.0-0.rc2.165.tar.bz2) = b8307e9abdb647e08917a0ada0b419a79a2e3af2f3a112ecafd52bcf6ca3843aa2995c730c5b1e09bfc771fdfe0a44895ba5c01a6b345f719408142b429c3e25
-- 
cgit