summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-06-25 12:35:23 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-06-25 12:35:23 +0200
commitcf00055ee636ed618313add609905ab9488aca62 (patch)
tree9db01bf87177195e29f7e60e2de8ec769bcc1313
parentefc6944e7db9c9222fef29de9ee977a9e8ddf19d (diff)
parent5aca1c6d9148bd54287514b1cac09244528025a4 (diff)
downloadkernel-cf00055ee636ed618313add609905ab9488aca62.tar.gz
kernel-cf00055ee636ed618313add609905ab9488aca62.tar.xz
kernel-cf00055ee636ed618313add609905ab9488aca62.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
-rw-r--r--Makefile.rhelver2
-rwxr-xr-xkernel.spec12
-rw-r--r--sources6
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 198ea3e2a..1bec7bd85 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 = 53
+RHEL_RELEASE = 54
#
# Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index 59d015708..bfb791fb7 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -73,7 +73,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc7.20210623git0c18f29aae7c.53
+%global distro_build 0.rc7.20210624git7426cedc7dad.54
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -119,13 +119,13 @@ Summary: The Linux kernel
%define kversion 5.13
%define rpmversion 5.13.0
-%define pkgrelease 0.rc7.20210623git0c18f29aae7c.53
+%define pkgrelease 0.rc7.20210624git7426cedc7dad.54
# This is needed to do merge window version magic
%define patchlevel 13
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.20210623git0c18f29aae7c.53%{?buildid}%{?dist}
+%define specrelease 0.rc7.20210624git7426cedc7dad.54%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -644,7 +644,7 @@ BuildRequires: clang
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.13-rc7-3-g0c18f29aae7c.tar.xz
+Source0: linux-5.13-rc7-10-g7426cedc7dad.tar.xz
Source1: Makefile.rhelver
@@ -1313,8 +1313,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.13-rc7-3-g0c18f29aae7c -c
-mv linux-5.13-rc7-3-g0c18f29aae7c linux-%{KVERREL}
+%setup -q -n kernel-5.13-rc7-10-g7426cedc7dad -c
+mv linux-5.13-rc7-10-g7426cedc7dad linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
diff --git a/sources b/sources
index 0720347cb..aceebdca7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.13-rc7-3-g0c18f29aae7c.tar.xz) = 222a6f6baf52c17bd4848cb5b75a1740c18f4b63f328614717aee20e04798e820665ba162b1d0835338cbbe49b119bd5b7c5a68a64ef348bfd39eeca5d883843
-SHA512 (kernel-abi-whitelists-5.13.0-0.rc7.20210623git0c18f29aae7c.53.tar.bz2) = 50e4ca53c9b9542b350cf8f3b67ce761e0798e4d0d66faf7232afc4f81a9aa7085b79d856a9bd215c3bc4ef787bb7a9843c8ba9b56395b7a6fef79c11ee72a52
-SHA512 (kernel-kabi-dw-5.13.0-0.rc7.20210623git0c18f29aae7c.53.tar.bz2) = 4b03549110ee4df360664164bd1eecdefeed1ccaa48d6666e333c3c322c6cde48361f093f952fbbee7bd1e59fe03f0ba48db8c57e967058d2f622f716125677e
+SHA512 (linux-5.13-rc7-10-g7426cedc7dad.tar.xz) = b9f559ee87999867bea98c9a6c0269947181958c8a5f8b1ffdadf67ce367305da3391ff8ae5f68980f445d4fa14564730f55bcb3c08d78d615a2610eaf3f4bd5
+SHA512 (kernel-abi-whitelists-5.13.0-0.rc7.20210624git7426cedc7dad.54.tar.bz2) = 9c9e30f991cb1399c9f89c0a3e9df55a2f786b9fc1b4767a89753a069c5e2b176d46b2cfde646434425a5507942c07fe58de53e1b32a2f25b93c78c6270de609
+SHA512 (kernel-kabi-dw-5.13.0-0.rc7.20210624git7426cedc7dad.54.tar.bz2) = c8c0f12a41c67db59f367560a3010f41fee949e4a1c02ac6e5fc841e6f0b3ad26aead25abaa614d14bf1b4d5b910826a6e921da91c674e5a838e66606cbc11c1