diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-27 19:00:45 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-27 19:00:45 +0200 |
| commit | 506260a3258dfcbd81c9c8b2f051b9c515ad6071 (patch) | |
| tree | 9e597c7cca2669aa1a2eac21aa79870aa092203a /kernel.spec | |
| parent | c8d3007a7246336c9069e131a40bcccb717ac1bb (diff) | |
| parent | a6d5bdfa755afd46b7cb294d2a32a4f53e79aef3 (diff) | |
| download | kernel-506260a3258dfcbd81c9c8b2f051b9c515ad6071.tar.gz kernel-506260a3258dfcbd81c9c8b2f051b9c515ad6071.tar.xz kernel-506260a3258dfcbd81c9c8b2f051b9c515ad6071.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc2.20200626git4a21185cda0f.1.vanilla.1.fc33kernel-5.8.0-0.rc2.20200626git4a21185cda0f.1.vanilla.1.fc32kernel-5.8.0-0.rc2.20200626git4a21185cda0f.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 20078ad84..c84ba49a8 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.rc2.20200623gitdd0d718152e4.1 +%global distro_build 0.rc2.20200626git4a21185cda0f.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.8.0 -%define pkgrelease 0.rc2.20200623gitdd0d718152e4.1 +%define pkgrelease 0.rc2.20200626git4a21185cda0f.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20200623gitdd0d718152e4.1%{?buildid}%{?dist} +%define specrelease 0.rc2.20200626git4a21185cda0f.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-20200623gitdd0d718152e4.tar.xz +Source0: linux-20200626git4a21185cda0f.tar.xz Source1: Makefile.rhelver @@ -786,6 +786,7 @@ Patch76: 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.patch Patch77: 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch Patch78: 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch Patch79: 0001-PCI-tegra-Revert-raw_violation_fixup-for-tegra124.patch +Patch80: 0001-redhat-Replace-hardware.redhat.com-link-in-Unsupport.patch %endif @@ -1281,8 +1282,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200623gitdd0d718152e4 -c -mv linux-20200623gitdd0d718152e4 linux-%{KVERREL} +%setup -q -n kernel-20200626git4a21185cda0f -c +mv linux-20200626git4a21185cda0f linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -1367,6 +1368,7 @@ ApplyOptionalPatch 0001-virt-vbox-Add-support-for-the-new-VBG_IOCTL_ACQUIRE_.pat ApplyOptionalPatch 0001-virt-vbox-Add-a-few-new-vmmdev-request-types-to-the-.patch ApplyOptionalPatch 0001-virt-vbox-Log-unknown-ioctl-requests-as-error.patch ApplyOptionalPatch 0001-PCI-tegra-Revert-raw_violation_fixup-for-tegra124.patch +ApplyOptionalPatch 0001-redhat-Replace-hardware.redhat.com-link-in-Unsupport.patch %endif @@ -2789,6 +2791,17 @@ fi # # %changelog +* Fri Jun 26 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc2.20200626git4a21185cda0f.1] +- 4a21185cda0f rebase +- Updated changelog for the release based on 8be3a53e18e0 (Fedora Kernel Team) + +* Thu Jun 25 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc2.20200625git8be3a53e18e0.1] +- 8be3a53e18e0 rebase +- redhat: Replace hardware.redhat.com link in Unsupported message (Prarit Bhargava) +- redhat/configs: Add .tmp files to .gitignore (Prarit Bhargava) +- disable uncommon TCP congestion control algorithms (Davide Caratti) +- Updated changelog for the release based on dd0d718152e4 (Fedora Kernel Team) + * Tue Jun 23 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc2.20200623gitdd0d718152e4.1] - dd0d718152e4 rebase - Add new bpf man pages ("Justin M. Forbes") |