diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-04 21:21:08 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-04 21:21:08 +0100 |
commit | 0b34da2194059656ba762f72fe31446c7cc38cc3 (patch) | |
tree | 77fe5d62deda7c1f4c75fca19288afdf2becfa00 /kernel.spec | |
parent | f657aa854e25eefc57bcc9f4f79683ee36c02cf2 (diff) | |
parent | 8072928de6ed1332e9515396ad441d57dde10378 (diff) | |
download | kernel-0b34da2194059656ba762f72fe31446c7cc38cc3.tar.gz kernel-0b34da2194059656ba762f72fe31446c7cc38cc3.tar.xz kernel-0b34da2194059656ba762f72fe31446c7cc38cc3.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc1.20210304gitf69d02e37a85.163.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index c0cc14351..bbddf1af2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -64,7 +64,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc1.162 +%global distro_build 0.rc1.20210304gitf69d02e37a85.163 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -107,13 +107,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc1.162 +%define pkgrelease 0.rc1.20210304gitf69d02e37a85.163 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.162%{?buildid}%{?dist} +%define specrelease 0.rc1.20210304gitf69d02e37a85.163%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -203,7 +203,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.12 @@ -604,7 +604,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.12-rc1.tar.xz +Source0: linux-20210304gitf69d02e37a85.tar.xz Source1: Makefile.rhelver @@ -1253,8 +1253,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.12-rc1 -c -mv linux-5.12-rc1 linux-%{KVERREL} +%setup -q -n kernel-20210304gitf69d02e37a85 -c +mv linux-20210304gitf69d02e37a85 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2756,8 +2756,14 @@ fi # # %changelog -* Mon Mar 01 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.12.0-0.rc1.162] +* Thu Mar 04 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc1.20210304gitf69d02e37a85.163] +- Revert "dt-bindings: panel: add binding for Xingbangda XBD599 panel" (Herton R. Krzesinski) +- redhat: remove CONFIG_DRM_PANEL_XINGBANGDA_XBD599 (Herton R. Krzesinski) +- Revert "drm: panel: add Xingbangda XBD599 panel" (Herton R. Krzesinski) +- Revert "drm/sun4i: sun6i_mipi_dsi: fix horizontal timing calculation" (Herton R. Krzesinski) +- New configs in arch/powerpc (Fedora Kernel Team) - Fix merge issue (Justin M. Forbes) +- Revert pending so that MR works (Justin M. Forbes) * Sat Feb 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc0.20210227gitc03c21ba6f4e.161] - Change the pending config for CONFIG_PPC_QUEUED_SPINLOCKS as it is now default upstream for 64-bit server CPUs (Justin M. Forbes) |