From cb611add7c1467856ef1b596ccb2b2951b79ab9a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 9 Mar 2021 11:33:02 -0600 Subject: kernel-5.12.0-0.rc1.20210305git280d542f6ffa.164 * Fri Mar 05 2021 Fedora Kernel Team [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 --- Makefile.rhelver | 2 +- kernel.spec | 14 +++++++------- sources | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 50f5b90a6..28f2db4d9 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 = 165 +RHEL_RELEASE = 166 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index 18686b558..bb12479c1 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.rc2.165 +%global distro_build 0.rc2.20210309git144c79ef3353.166 %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.rc2.165 +%define pkgrelease 0.rc2.20210309git144c79ef3353.166 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.165%{?buildid}%{?dist} +%define specrelease 0.rc2.20210309git144c79ef3353.166%{?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 1 +%define debugbuildsenabled 0 # 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-5.12-rc2.tar.xz +Source0: linux-20210309git144c79ef3353.tar.xz Source1: Makefile.rhelver @@ -1250,8 +1250,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12-rc2 -c -mv linux-5.12-rc2 linux-%{KVERREL} +%setup -q -n kernel-20210309git144c79ef3353 -c +mv linux-20210309git144c79ef3353 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . diff --git a/sources b/sources index 2cc4208a9..d97293c0d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -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 +SHA512 (linux-20210309git144c79ef3353.tar.xz) = d40a67363e71da3b2d6e58029c7d61e27198cdd715bf22b832b29e26087aa6fde8dd13ee24f3a5f06ba4f5ca11ab6180ca2dc54b19ec024c87f43c3d01750472 +SHA512 (kernel-abi-whitelists-5.12.0-0.rc2.20210309git144c79ef3353.166.tar.bz2) = 83c08ec04a97adf170b8da94a620e4ca7d36a531c2a1cec174feb1d244e9745ee165d9707b2587779be18f8341792e038600ff3656d1b141d446d5de81ac4e33 +SHA512 (kernel-kabi-dw-5.12.0-0.rc2.20210309git144c79ef3353.166.tar.bz2) = db4c9c43ecb610e71463a7dfa94fee2f3f3667347a5ccdcad402935f4c2b5614864254a0960b6f07302dbfa8c8ac00b5af98ce9255081dc1aa4daca05dee2efe -- cgit