diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-30 17:27:50 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-30 17:27:50 +0200 |
commit | 4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889 (patch) | |
tree | 150afad4fec988039a3a1adb2a41fb53c7541f8b /kernel.spec | |
parent | 959362ef3bbc5453308946a9bbb9d0b4a0d5c60f (diff) | |
parent | 91e7add6fe8f7ffb464d7d07e7f6e6e23e7e7f53 (diff) | |
download | kernel-4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889.tar.gz kernel-4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889.tar.xz kernel-4f7472ccd0a7b6a9ab0c005e9dbbd1663e165889.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 21913bde5..296999818 100755 --- a/kernel.spec +++ b/kernel.spec @@ -78,9 +78,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc3.25 +%global distro_build 0.rc3.20210930git02d5e016800d.28 %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.rc3.25 +%define pkgrelease 0.rc3.20210930git02d5e016800d.28 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.25%{?buildid}%{?dist} +%define specrelease 0.rc3.20210930git02d5e016800d.28%{?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-rc3.tar.xz +Source0: linux-5.15-rc3-135-g02d5e016800d.tar.xz Source1: Makefile.rhelver @@ -1360,8 +1360,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc3 -c -mv linux-5.15-rc3 linux-%{KVERREL} +%setup -q -n kernel-5.15-rc3-135-g02d5e016800d -c +mv linux-5.15-rc3-135-g02d5e016800d linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2964,6 +2964,19 @@ fi # # %changelog +* Thu Sep 30 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc3.20210930git02d5e016800d.28] +- redhat/configs: Remove CONFIG_INFINIBAND_I40IW (Kamal Heib) + +* Wed Sep 29 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc3.20210929gita4e6f95a891a.27] +- cleanup CONFIG_X86_PLATFORM_DRIVERS_INTEL (David Arcari) +- redhat: rename usage of .rhel8git.mk to .rhpkg.mk (Herton R. Krzesinski) + +* Tue Sep 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc3.20210928git0513e464f900.26] +- Manually add pending items that need to be set due to mismatch (Justin M. Forbes) +- Clean up pending common (Justin M. Forbes) +- redhat/configs: Enable CONFIG_BLK_CGROUP_IOLATENCY & CONFIG_BLK_CGROUP_FC_APPID (Waiman Long) [2006813] +- redhat: remove kernel.changelog-8.99 file (Herton R. Krzesinski) + * Thu Sep 23 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc2.20210923git58e2cf5d7946.21] - redhat/configs: enable CONFIG_SQUASHFS_ZSTD which is already enabled in Fedora 34 (Tao Liu) [1998953] |