From e0d6dc55de12564454c41b225af9f213584c6f1d Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 8 Apr 2021 07:26:11 -0500 Subject: kernel-5.12.0-0.rc6.20210407git2d743660786e.185 * Wed Apr 07 2021 Fedora Kernel Team [5.12.0-0.rc6.20210407git2d743660786e.185] - common/ark: cleanup and unify the parport configs (Peter Robinson) - iommu/vt-d: enable INTEL_IDXD_SVM for both fedora and rhel (Jerry Snitselaar) - REDHAT: coresight: etm4x: Disable coresight on HPE Apollo 70 (Jeremy Linton) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.spec | 12 ++++++------ sources | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 7fa15e3ea..e4513f239 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 = 185 +RHEL_RELEASE = 186 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index 3535b9476..1ec7e0744 100755 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc6.20210407git2d743660786e.185 +%global distro_build 0.rc6.20210408git454859c552da.186 %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.rc6.20210407git2d743660786e.185 +%define pkgrelease 0.rc6.20210408git454859c552da.186 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20210407git2d743660786e.185%{?buildid}%{?dist} +%define specrelease 0.rc6.20210408git454859c552da.186%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -620,7 +620,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210407git2d743660786e.tar.xz +Source0: linux-20210408git454859c552da.tar.xz Source1: Makefile.rhelver @@ -1274,8 +1274,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210407git2d743660786e -c -mv linux-20210407git2d743660786e linux-%{KVERREL} +%setup -q -n kernel-20210408git454859c552da -c +mv linux-20210408git454859c552da linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . diff --git a/sources b/sources index 4db3bd9ad..613ac6b95 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-20210407git2d743660786e.tar.xz) = cf33381f42870ce6a2f7e99a26ee694f6126e7b16b3052d875b5d304cf2aa2d00b3016d152d534bf62aff5bfbe67dcd1c96c5840116523b3e5d478eab47479e9 -SHA512 (kernel-abi-whitelists-5.12.0-0.rc6.20210407git2d743660786e.185.tar.bz2) = f4d479823c9dfc3caaed18069bde723568199bd24b163a0984c1e91952abcb983b0e9844f90d4ce3b56cbcc919f827d66973b5a1341f89b6e4ffe03e8630b40a -SHA512 (kernel-kabi-dw-5.12.0-0.rc6.20210407git2d743660786e.185.tar.bz2) = 2c0df0b954dc7d03cbb3e9d6a06df22ff1353b09fbc5bd4b2aefa9ff97c344ffa6a093b54b65aeac311bbcbf80da22237fe1d1a8f7bcd89ddcf3d0e204b48f9e +SHA512 (linux-20210408git454859c552da.tar.xz) = d598a8a19023b6ffdbb3f2b1c6b4bcb3cf2e31bed09ed5ffc901bd9e779927fd33a0b0c57d15e2742dfaa3047f5c417620031f5d3c59ae3b98b7b71304402a32 +SHA512 (kernel-abi-whitelists-5.12.0-0.rc6.20210408git454859c552da.186.tar.bz2) = 86e708268cbb7b2d9df2e083be52e7a224117992c1c0f74f8bf5b895d31e1582356d5915c68294682f884f4aa5b8260eba2d076321351af6f8d22a9eb59ee304 +SHA512 (kernel-kabi-dw-5.12.0-0.rc6.20210408git454859c552da.186.tar.bz2) = b038aae2316f94d61b2bd1b8819bf6063e876638ff64be453c76379cfb1f00d88bf906f274e0cca5c4c5a29b12b10726d652b23151df0f4d925be2ebbb832a33 -- cgit