diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-23 17:04:35 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-23 17:04:35 +0200 |
| commit | c8d3007a7246336c9069e131a40bcccb717ac1bb (patch) | |
| tree | acd77e4e8605a290e487ab82d194ecccc9493bb1 /kernel.spec | |
| parent | 7cea9df3ee02b4675250301b5ba161abdd83a175 (diff) | |
| parent | 4b70444246165a02d0c835248cfd48105c19d60d (diff) | |
| download | kernel-c8d3007a7246336c9069e131a40bcccb717ac1bb.tar.gz kernel-c8d3007a7246336c9069e131a40bcccb717ac1bb.tar.xz kernel-c8d3007a7246336c9069e131a40bcccb717ac1bb.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc2.20200623gitdd0d718152e4.1.vanilla.1.fc33kernel-5.8.0-0.rc2.20200623gitdd0d718152e4.1.vanilla.1.fc32kernel-5.8.0-0.rc2.20200623gitdd0d718152e4.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index c0bb1d95a..20078ad84 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.20200622git625d3449788f.1 +%global distro_build 0.rc2.20200623gitdd0d718152e4.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.20200622git625d3449788f.1 +%define pkgrelease 0.rc2.20200623gitdd0d718152e4.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.20200622git625d3449788f.1%{?buildid}%{?dist} +%define specrelease 0.rc2.20200623gitdd0d718152e4.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-20200622git625d3449788f.tar.xz +Source0: linux-20200623gitdd0d718152e4.tar.xz Source1: Makefile.rhelver @@ -1281,8 +1281,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200622git625d3449788f -c -mv linux-20200622git625d3449788f linux-%{KVERREL} +%setup -q -n kernel-20200623gitdd0d718152e4 -c +mv linux-20200623gitdd0d718152e4 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2665,6 +2665,8 @@ fi %{_sysconfdir}/bash_completion.d/bpftool %{_mandir}/man8/bpftool-cgroup.8.gz %{_mandir}/man8/bpftool-gen.8.gz +%{_mandir}/man8/bpftool-iter.8.gz +%{_mandir}/man8/bpftool-link.8.gz %{_mandir}/man8/bpftool-map.8.gz %{_mandir}/man8/bpftool-prog.8.gz %{_mandir}/man8/bpftool-perf.8.gz @@ -2787,6 +2789,12 @@ fi # # %changelog +* 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") +- Add default option for CONFIG_ARM64_BTI_KERNEL to pending-common so that eln kernels build ("Justin M. Forbes") +- Updated changelog for the release based on 625d3449788f (Fedora Kernel Team) + * Mon Jun 22 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc2.20200622git625d3449788f.1] - 625d3449788f rebase - Updated changelog for the release based on 1b5044021070 (Fedora Kernel Team) |