diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-17 12:33:05 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-17 12:33:05 +0200 |
commit | 0ab441e23be27600b97a7d5d9a226e886dac606e (patch) | |
tree | 3274050b423853cc28f54bfed48238e39b8ce842 | |
parent | fcf8bdc6183d8ee217ce78321b42b8e4cbb975ac (diff) | |
parent | 6a09581235e5615d0b2519fa8c73a071c3911533 (diff) | |
download | kernel-0ab441e23be27600b97a7d5d9a226e886dac606e.tar.gz kernel-0ab441e23be27600b97a7d5d9a226e886dac606e.tar.xz kernel-0ab441e23be27600b97a7d5d9a226e886dac606e.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc1.20210916gitff1ffd71d5f0.14.vanilla.1.fc36kernel-5.15.0-0.rc1.20210916gitff1ffd71d5f0.14.vanilla.1.fc35kernel-5.15.0-0.rc1.20210916gitff1ffd71d5f0.14.vanilla.1.fc34kernel-5.15.0-0.rc1.20210916gitff1ffd71d5f0.14.vanilla.1.fc33
-rw-r--r-- | Makefile.rhelver | 2 | ||||
-rwxr-xr-x | kernel.spec | 14 | ||||
-rw-r--r-- | sources | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver index 18afd0195..e4f22ec46 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 = 13 +RHEL_RELEASE = 14 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index cb85fd08b..8bc06be89 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc1.20210915git3ca706c189db.13 +%global distro_build 0.rc1.20210916gitff1ffd71d5f0.14 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -127,13 +127,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc1.20210915git3ca706c189db.13 +%define pkgrelease 0.rc1.20210916gitff1ffd71d5f0.14 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20210915git3ca706c189db.13%{?buildid}%{?dist} +%define specrelease 0.rc1.20210916gitff1ffd71d5f0.14%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -674,7 +674,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc1-19-g3ca706c189db.tar.xz +Source0: linux-5.15-rc1-33-gff1ffd71d5f0.tar.xz Source1: Makefile.rhelver @@ -1360,8 +1360,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc1-19-g3ca706c189db -c -mv linux-5.15-rc1-19-g3ca706c189db linux-%{KVERREL} +%setup -q -n kernel-5.15-rc1-33-gff1ffd71d5f0 -c +mv linux-5.15-rc1-33-gff1ffd71d5f0 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2964,7 +2964,7 @@ fi # # %changelog -* Wed Sep 15 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.15-0.rc1.20210915git3ca706c189db.13] +* Thu Sep 16 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.20210916gitff1ffd71d5f0.14] - Build kernel-doc for Fedora (Justin M. Forbes) * Wed Sep 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.20210915git3ca706c189db.13] @@ -1,3 +1,3 @@ -SHA512 (linux-5.15-rc1-19-g3ca706c189db.tar.xz) = b44c2ab8159c43e54980c0a45b1058836dd4488fcb93fc8c7b073bbf119ca1c5ca5a07e2ddf6cf112776702e8c0455ed23cf23895027820b94bd1924478d5dcf -SHA512 (kernel-abi-stablelists-5.15.0-0.rc1.20210915git3ca706c189db.13.tar.bz2) = 061634f2dcdbd8b12fc6ade761cb9e1e56bbf7ab3b229dabec2aa02a756fa52bb4fb0f93c2f3c615631eb8af3dedd228274a7bf7a10a3f5c9e7e9a65858f2447 -SHA512 (kernel-kabi-dw-5.15.0-0.rc1.20210915git3ca706c189db.13.tar.bz2) = 44c39cffc00feec7a6454ecd47e4c5edd25705382e28470810c41f46f496e20a28975037eb61437d1cb320c648b4201360e3fafb2b1dfd74b150802f2077c907 +SHA512 (linux-5.15-rc1-33-gff1ffd71d5f0.tar.xz) = d9c173ad69f556f8feb490d7f81c15f1440d7f16752760a7d428474a02dc5b0ec9b0aa03b00b20d55d31603de4dcb916507925bbefac4acfa827054c66e9bb31 +SHA512 (kernel-abi-stablelists-5.15.0-0.rc1.20210916gitff1ffd71d5f0.14.tar.bz2) = d9f414f8aa3c11c093274efdd6fcfe0d328c99796be3b0b7009dd2625d4a47fec2a6750f1928a6457ce198f93e941d180a291e469fad7a6f25d7e0e526ee71f6 +SHA512 (kernel-kabi-dw-5.15.0-0.rc1.20210916gitff1ffd71d5f0.14.tar.bz2) = 1974c7d61774ac4e530b0f63feed6540cb92e4121ecb605a76013aae120252279b5a6a0514d77e35bdcae070df07a04d89e9ff767dd94daaa666cd54250b3b64 |