diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-05 06:29:16 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-05 06:29:16 +0200 |
commit | b86b93eae14c762ea2babc124bb2adad15f5f4db (patch) | |
tree | 553c9b42ba8ffa11e8c954645f3da5a274326dc5 /kernel.spec | |
parent | 3d790d94ced7efa449659532cd178f7c37080e68 (diff) | |
parent | 9de60b93e3bf3e4cf5e3bd1f54f12379c697942b (diff) | |
download | kernel-b86b93eae14c762ea2babc124bb2adad15f5f4db.tar.gz kernel-b86b93eae14c762ea2babc124bb2adad15f5f4db.tar.xz kernel-b86b93eae14c762ea2babc124bb2adad15f5f4db.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc4.33.vanilla.1.fc36kernel-5.15.0-0.rc4.33.vanilla.1.fc35kernel-5.15.0-0.rc4.33.vanilla.1.fc34kernel-5.15.0-0.rc4.33.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index fb39d10c2..278c45e75 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc3.20211001git4de593fb965f.30 +%global distro_build 0.rc4.33 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc3.20211001git4de593fb965f.30 +%define pkgrelease 0.rc4.33 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20211001git4de593fb965f.30%{?buildid}%{?dist} +%define specrelease 0.rc4.33%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -679,7 +679,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc3-240-g4de593fb965f.tar.xz +Source0: linux-5.15-rc4.tar.xz Source1: Makefile.rhelver @@ -1370,8 +1370,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc3-240-g4de593fb965f -c -mv linux-5.15-rc3-240-g4de593fb965f linux-%{KVERREL} +%setup -q -n kernel-5.15-rc4 -c +mv linux-5.15-rc4 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2974,8 +2974,17 @@ fi # # %changelog -* Fri Oct 01 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc3.20211001git4de593fb965f.30] +* Mon Oct 04 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc4.33] +- Fix ordering in genspec args (Justin M. Forbes) + +* Sat Oct 02 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc3.20211002git53d5fc89d66a.30] +- redhat/configs: Enable Hyper-V guests on ARM64 (Vitaly Kuznetsov) [2007430] +- redhat: configs: Enable CONFIG_THINKPAD_LMI (Hans de Goede) +- redhat/docs: update Koji link to avoid redirect (Joel Savitz) +- redhat: add support for different profiles with dist*-brew (Herton R. Krzesinski) - Fix BPF selftests build on ppc64 (Justin M. Forbes) +- redhat: configs: Disable xtables and ipset (Phil Sutter) [1945179] +- redhat: Add mark_driver_deprecated() (Phil Sutter) [1945179] * Fri Oct 01 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc3.20211001git4de593fb965f.29] - Change s390x CONFIG_NODES_SHIFT from 4 to 1 (Justin M. Forbes) |