summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2022-01-26 18:26:27 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2022-01-26 18:26:27 +0100
commitf1f91cb2ab81b8ce24bfa8e55881c890bacf38b1 (patch)
tree498f5ea3c4132eb8248fa032545611365fa64c3c
parent83189801bb9d845a1b54bb7a92bacc0041c4d747 (diff)
parent360ce2241bf5779d09e67e224a208c69f81e1875 (diff)
downloadkernel-5.17.0-0.rc1.20220126git0280e3c58f92.77.vanilla.1.fc34.tar.gz
kernel-5.17.0-0.rc1.20220126git0280e3c58f92.77.vanilla.1.fc34.tar.xz
kernel-5.17.0-0.rc1.20220126git0280e3c58f92.77.vanilla.1.fc34.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc1.20220126git0280e3c58f92.77.vanilla.1.fc35kernel-5.17.0-0.rc1.20220126git0280e3c58f92.77.vanilla.1.fc34
-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 fea2f7411..1287ea8e5 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 = 76
+RHEL_RELEASE = 77
#
# Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index 43f5be7f1..6c14f1993 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -87,7 +87,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
-%global distro_build 0.rc1.20220125gita08b41ab9e2e.76
+%global distro_build 0.rc1.20220126git0280e3c58f92.77
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -134,13 +134,13 @@ Summary: The Linux kernel
%define rpmversion 5.17.0
%define patchversion 5.17
-%define pkgrelease 0.rc1.20220125gita08b41ab9e2e.76
+%define pkgrelease 0.rc1.20220126git0280e3c58f92.77
# This is needed to do merge window version magic
%define patchlevel 17
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.20220125gita08b41ab9e2e.76%{?buildid}%{?dist}
+%define specrelease 0.rc1.20220126git0280e3c58f92.77%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -694,7 +694,7 @@ BuildRequires: lld
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.17-rc1-36-ga08b41ab9e2e.tar.xz
+Source0: linux-5.17-rc1-81-g0280e3c58f92.tar.xz
Source1: Makefile.rhelver
@@ -1388,8 +1388,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.17-rc1-36-ga08b41ab9e2e -c
-mv linux-5.17-rc1-36-ga08b41ab9e2e linux-%{KVERREL}
+%setup -q -n kernel-5.17-rc1-81-g0280e3c58f92 -c
+mv linux-5.17-rc1-81-g0280e3c58f92 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
diff --git a/sources b/sources
index 6f9c9d793..c3841df77 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.17-rc1-36-ga08b41ab9e2e.tar.xz) = 86631129d47ebbcc23d64263eefcf992a099667537ad3af8067f3d3fdb9e7b7f8900ccc7d641962b35e6b0f4ffc7cc0a9747ab4d4f6ddd1ee539b51d975eea99
-SHA512 (kernel-abi-stablelists-5.17.0-0.rc1.20220125gita08b41ab9e2e.76.tar.bz2) = 0253f98bec9538d4d5939560240a6a910cc6af9de72acc39ee782903e2c4a06c9fb2a3e3a6a07e8724151332da9a41564fc27e6022f1e115a60e7465fdda5f00
-SHA512 (kernel-kabi-dw-5.17.0-0.rc1.20220125gita08b41ab9e2e.76.tar.bz2) = 43efa7ce0781b6ba0545f156e56b83d23af74b35f2dbb60b048784382b62f75087990e8c599ff90c3082a34d1836dcad74b7d52375c161ba6b69589132cb2ca5
+SHA512 (linux-5.17-rc1-81-g0280e3c58f92.tar.xz) = 5746fcdd5100c1967bb61959411ca607ef9db05978fdd3c7b5034714636caa965854f13469352cc9b881057caa2b196592df0dc4b0e1b1e3f1c8f782521ab828
+SHA512 (kernel-abi-stablelists-5.17.0-0.rc1.20220126git0280e3c58f92.77.tar.bz2) = 3b63585fa3041766839af98e068e49868214a0afe3576b6f266e2a20871b8d985572ad9b5a8da67b300401d60dfa27853b62cf0ffa60b9d86f8d363d9128facb
+SHA512 (kernel-kabi-dw-5.17.0-0.rc1.20220126git0280e3c58f92.77.tar.bz2) = 44924a32a9e53b737bbde16576664533a9749040f7c3d885eaffbbd7bc7f65c4d525eed1b2a1ab207f849739f8e2e215c17b383d3db321ab3d6d2228fed8804e