diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-21 20:13:19 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-21 20:13:19 +0200 |
| commit | c01e23554af1d0635829396c9b8b7f5040a2d7d3 (patch) | |
| tree | c436ae3689e1994981ecab857e0e85c171b49722 /kernel.spec | |
| parent | adaff2fee66a964ee87251de98e9f58f7ba5cb92 (diff) | |
| parent | 1e0aef3c8fd22ad01d73d3a066e72a26328d3ef2 (diff) | |
| download | kernel-c01e23554af1d0635829396c9b8b7f5040a2d7d3.tar.gz kernel-c01e23554af1d0635829396c9b8b7f5040a2d7d3.tar.xz kernel-c01e23554af1d0635829396c9b8b7f5040a2d7d3.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc1.20200821gitda2968ff879b.1.vanilla.2.fc34kernel-5.9.0-0.rc1.20200821gitda2968ff879b.1.vanilla.2.fc33kernel-5.9.0-0.rc1.20200821gitda2968ff879b.1.vanilla.2.fc32kernel-5.9.0-0.rc1.20200821gitda2968ff879b.1.vanilla.2.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index ab03dfe60..fbe7a2425 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc1.20200820git18445bf405cb.1 +%global distro_build 0.rc1.20200821gitda2968ff879b.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.9.0 -%define pkgrelease 0.rc1.20200820git18445bf405cb.1 +%define pkgrelease 0.rc1.20200821gitda2968ff879b.1 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20200820git18445bf405cb.1%{?buildid}%{?dist} +%define specrelease 0.rc1.20200821gitda2968ff879b.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -569,7 +569,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200820git18445bf405cb.tar.xz +Source0: linux-20200821gitda2968ff879b.tar.xz Source1: Makefile.rhelver @@ -790,6 +790,7 @@ Patch70: 0001-redhat-Replace-hardware.redhat.com-link-in-Unsupport.patch Patch71: 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch Patch72: 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch Patch73: 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch +Patch74: 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch %endif @@ -1285,8 +1286,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200820git18445bf405cb -c -mv linux-20200820git18445bf405cb linux-%{KVERREL} +%setup -q -n kernel-20200821gitda2968ff879b -c +mv linux-20200821gitda2968ff879b linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -1365,6 +1366,7 @@ ApplyOptionalPatch 0001-redhat-Replace-hardware.redhat.com-link-in-Unsupport.pat ApplyOptionalPatch 0001-arch-x86-Remove-vendor-specific-CPU-ID-checks.patch ApplyOptionalPatch 0001-Fixes-acpi-prefer-booting-with-ACPI-over-DTS-to-be-R.patch ApplyOptionalPatch 0001-Work-around-for-gcc-bug-https-gcc.gnu.org-bugzilla-s.patch +ApplyOptionalPatch 0001-Temporarily-remove-cdomain-from-sphinx-documentation.patch %endif @@ -2783,6 +2785,13 @@ fi # # %changelog +* Fri Aug 21 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.20200821gitda2968ff879b.1] +- da2968ff879b rebase +- Temporarily remove cdomain from sphinx documentation ("Justin M. Forbes") +- Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 ("Justin M. Forbes") +- Updated changelog for the release based on 18445bf405cb (Fedora Kernel Team) +- enable PROTECTED_VIRTUALIZATION_GUEST for all s390x kernels (=?UTF-8?q?Dan=20Hor=C3=A1k?=) + * Wed Aug 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.9.0-0.rc1.20200819git18445bf405cb.1] - 18445bf405cb rebase - Add mlx5_vdpa to module filter for Fedora ("Justin M. Forbes") |