diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-19 15:37:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-19 15:37:55 +0200 |
commit | 145a17d9e047c263b718cbe4bc243d0ee1ecf466 (patch) | |
tree | 5a9e88daef4e9cb5c7266a67969ee0e7141b8ac7 /kernel.spec | |
parent | 005c641a033a96ffc25e32fd4e39001248776fc1 (diff) | |
parent | 5f0e0f3c714a197de8d36ab1c984fc722e87c60d (diff) | |
download | kernel-145a17d9e047c263b718cbe4bc243d0ee1ecf466.tar.gz kernel-145a17d9e047c263b718cbe4bc243d0ee1ecf466.tar.xz kernel-145a17d9e047c263b718cbe4bc243d0ee1ecf466.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc2.23.vanilla.1.fc35kernel-5.14.0-0.rc2.23.vanilla.1.fc34kernel-5.14.0-0.rc2.23.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 92b0e5fc2..649445100 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.rc1.20210714git40226a3d96ef.18 +%global distro_build 0.rc2.23 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -119,13 +119,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc1.20210714git40226a3d96ef.18 +%define pkgrelease 0.rc2.23 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20210714git40226a3d96ef.18%{?buildid}%{?dist} +%define specrelease 0.rc2.23%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -657,7 +657,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc1-16-g40226a3d96ef.tar.xz +Source0: linux-5.14-rc2.tar.xz Source1: Makefile.rhelver @@ -1342,8 +1342,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc1-16-g40226a3d96ef -c -mv linux-5.14-rc1-16-g40226a3d96ef linux-%{KVERREL} +%setup -q -n kernel-5.14-rc2 -c +mv linux-5.14-rc2 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2928,6 +2928,16 @@ fi # # %changelog +* Mon Jul 19 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210719git1d67c8d993ba.22] +- Revert "scsi: smartpqi: add inspur advantech ids" (Herton R. Krzesinski) +- redhat/configs: Enable stmmac NIC for x86_64 (Mark Salter) + +* Thu Jul 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210715git40226a3d96ef.19] +- all: hyperv: use the DRM driver rather than FB (Peter Robinson) +- all: hyperv: unify the Microsoft HyperV configs (Peter Robinson) +- all: VMWare: clean up VMWare configs (Peter Robinson) +- Update CONFIG_ARM_FFA_TRANSPORT (Patrick Talbert) + * Wed Jul 14 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210714git40226a3d96ef.18] - CI: Handle all mirrors (Veronika Kabatova) - Turn on CONFIG_STACKTRACE for s390x zfpcdump kernels (Justin M. Forbes) |