diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-06 18:41:06 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-03-06 18:41:06 +0100 |
commit | 1877af72208ad72326ed1fa449d476bdf9c31a98 (patch) | |
tree | 09b436125ce9cf9e86ff003d6cf5193e5446d6b2 /kernel.spec | |
parent | 219dcfaa9d4a2c3561ae2f96396050ffeecd3c33 (diff) | |
parent | d39973b4a653d7599750ea3bf0097993563848f3 (diff) | |
download | kernel-1877af72208ad72326ed1fa449d476bdf9c31a98.tar.gz kernel-1877af72208ad72326ed1fa449d476bdf9c31a98.tar.xz kernel-1877af72208ad72326ed1fa449d476bdf9c31a98.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc2.165.vanilla.1.fc35kernel-5.12.0-0.rc2.165.vanilla.1.fc34kernel-5.12.0-0.rc2.165.vanilla.1.fc33kernel-5.12.0-0.rc2.165.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index b2741e603..1c22b5ab6 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.20210304gitf69d02e37a85.163 +%global distro_build 0.rc2.165 %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.20210304gitf69d02e37a85.163 +%define pkgrelease 0.rc2.165 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20210304gitf69d02e37a85.163%{?buildid}%{?dist} +%define specrelease 0.rc2.165%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -604,7 +604,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210304gitf69d02e37a85.tar.xz +Source0: linux-5.12-rc2.tar.xz Source1: Makefile.rhelver @@ -1253,8 +1253,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210304gitf69d02e37a85 -c -mv linux-20210304gitf69d02e37a85 linux-%{KVERREL} +%setup -q -n kernel-5.12-rc2 -c +mv linux-5.12-rc2 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2756,6 +2756,9 @@ fi # # %changelog +* Fri Mar 05 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc1.20210305git280d542f6ffa.164] +- Revert "ARM: fix __get_user_check() in case uaccess_* calls are not inlined" (Herton R. Krzesinski) + * 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) |