diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-19 22:25:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-19 22:25:11 +0200 |
| commit | ce0248d923b0c428ecdeb47131c5c2cd15500b12 (patch) | |
| tree | bd66c91b6c078f1d0214f69d5078993046fbf285 /kernel.spec | |
| parent | aae208c12f61545f388c2e6d1f22c30ec858c293 (diff) | |
| parent | cd543e686ce88c965f020d883ca3037f4fde6d46 (diff) | |
| download | kernel-ce0248d923b0c428ecdeb47131c5c2cd15500b12.tar.gz kernel-ce0248d923b0c428ecdeb47131c5c2cd15500b12.tar.xz kernel-ce0248d923b0c428ecdeb47131c5c2cd15500b12.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc6.20200519git642b151f45dd.1.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index c46fd7c6c..273e603fe 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.rc6.1 +%global distro_build 0.rc6.20200519git642b151f45dd.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,10 +71,10 @@ Summary: The Linux kernel %endif %define rpmversion 5.7.0 -%define pkgrelease 0.rc6.1 +%define pkgrelease 0.rc6.20200519git642b151f45dd.1 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.1%{?buildid}%{?dist} +%define specrelease 0.rc6.20200519git642b151f45dd.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -165,7 +165,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.7 @@ -566,7 +566,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.7-rc6.tar.xz +Source0: linux-20200519git642b151f45dd.tar.xz Source1: Makefile.rhelver @@ -780,6 +780,7 @@ Patch73: 0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.patch Patch74: 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch Patch75: 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch Patch76: 0001-perf-cs-etm-Move-defined-of-traceid_list.patch +Patch77: 0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch %endif @@ -1275,8 +1276,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.7-rc6 -c -mv linux-5.7-rc6 linux-%{KVERREL} +%setup -q -n kernel-20200519git642b151f45dd -c +mv linux-20200519git642b151f45dd linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -1358,6 +1359,7 @@ ApplyOptionalPatch 0001-drm-sun4i-sun6i_mipi_dsi-fix-horizontal-timing-calcu.pat ApplyOptionalPatch 0001-arm64-allwinner-dts-a64-add-LCD-related-device-nodes.patch ApplyOptionalPatch 0001-e1000e-bump-up-timeout-to-wait-when-ME-un-configure-.patch ApplyOptionalPatch 0001-perf-cs-etm-Move-defined-of-traceid_list.patch +ApplyOptionalPatch 0001-pwm-lpss-Fix-get_state-runtime-pm-reference-handling.patch %endif @@ -2766,6 +2768,11 @@ fi # # %changelog +* Tue May 19 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc6.20200519git642b151f45dd.1] +- 642b151f45dd rebase +- pwm: lpss: Fix get_state runtime-pm reference handling (Hans de Goede) +- Updated changelog for the release based on v5.7-rc6 ("CKI@GitLab") + * Mon May 18 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc6.1] - v5.7-rc6 rebase - Updated changelog for the release based on 3d1c1e5931ce ("CKI@GitLab") |