From 12b1fe9f131f36206e2304ab77ac04d406d1402b Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Wed, 20 Jan 2021 08:29:57 -0500 Subject: [PATCH] kernel-5.11.0-0.rc4.131.el9 * Wed Jan 20 2021 Herton R. Krzesinski [5.11.0-0.rc4.131] - v5.11-rc4-15-g45dfb8a5659a rebase - redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski) - redhat: add genlog.py script (Herton R. Krzesinski) Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- Patchlist.changelog | 4 ++-- kernel.spec | 24 +++++++++++++----------- sources | 6 +++--- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 529fd9e..757c08d 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 130 +RHEL_RELEASE = 131 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 13f6d76..dffa47c 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/3735d3de5dd3cafb1e27e4c03fd30739fe07241e - 3735d3de5dd3cafb1e27e4c03fd30739fe07241e irq: export irq_check_status_bit +https://gitlab.com/cki-project/kernel-ark/-/commit/6041aa1ca31a9c8b878b142602e2a2bbcdedb902 + 6041aa1ca31a9c8b878b142602e2a2bbcdedb902 irq: export irq_check_status_bit https://gitlab.com/cki-project/kernel-ark/-/commit/e187313e5f0086538fefe0925ef84480f99616d8 e187313e5f0086538fefe0925ef84480f99616d8 gcc-plugins: fix gcc 11 indigestion with plugins... diff --git a/kernel.spec b/kernel.spec index b17305c..6ae815b 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.rc4.130 +%global distro_build 0.rc4.131 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -105,13 +105,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc4.130 +%define pkgrelease 0.rc4.131 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.130%{?buildid}%{?dist} +%define specrelease 0.rc4.131%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -601,7 +601,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.11.0-0.rc4.130.tar.xz +Source0: linux-5.11.0-0.rc4.131.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc4.130 -c -mv linux-5.11.0-0.rc4.130 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc4.131 -c +mv linux-5.11.0-0.rc4.131 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2735,15 +2735,17 @@ fi # # %changelog -* Tue Jan 19 2021 Herton R. Krzesinski [5.11.0-0.rc4.130] -- v5.11-rc4-8-g1e2a199f6ccd rebase +* Wed Jan 20 2021 Herton R. Krzesinski [5.11.0-0.rc4.131] +- v5.11-rc4-15-g45dfb8a5659a rebase -* Tue Jan 19 2021 Fedora Kernel Team [5.11.0-0.rc4.20210119git1e2a199f6ccd.130] +* Wed Jan 20 2021 Fedora Kernel Team [5.11.0-0.rc4.20210120git45dfb8a5659a.131] +- redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski) +- redhat: add genlog.py script (Herton R. Krzesinski) - irq: export irq_check_status_bit (Levi Yun) -- Turn off vdso_install for ppc ("Justin M. Forbes") +- Turn off vdso_install for ppc (Justin M. Forbes) * Tue Jan 19 2021 Fedora Kernel Team [5.11.0-0.rc4.20210119git1e2a199f6ccd.129] -- all: s390x: Increase CONFIG_PCI_NR_FUNCTIONS to 512 (#1888735) (Dan Horák) +- all: s390x: Increase CONFIG_PCI_NR_FUNCTIONS to 512 (#1888735) (=?UTF-8?q?Dan=20Hor=C3=A1k?=) * Sat Jan 16 2021 Fedora Kernel Team [5.11.0-0.rc3.20210116git1d94330a437a.126] - Fedora 5.11 configs pt 1 ("Justin M. Forbes") diff --git a/sources b/sources index 01e7481..4749972 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc4.130.tar.xz) = 9bf490abfa55067288bcbff7a91816870e1130751f0085a60b29e3f301083f958464a4b36bf867f2c064aee67b4656146d64b220dd7be4d55991566b30be11b9 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.130.tar.bz2) = e4b54310df978666f42dd6cd85a3a97f5024500db4c24bf07956ab4af9095e59c44d97a4a26a46bfdb7c02ac429086226ceca271237521a368629df5a7d943bf -SHA512 (kernel-kabi-dw-5.11.0-0.rc4.130.tar.bz2) = 2aa15c2d1f691930e06e6d25a788ebe87ad3fbbd5e37cf06ea4ffdb71dd07eb04b59fe0763a758571213c4cc0cf7fe9c7b38542f48be5f5d7e1b8e7a7a8a0f13 +SHA512 (linux-5.11.0-0.rc4.131.tar.xz) = d92302df8b0eeede6cbb12d229b7ba45436b82615e43d39c9db6561a90b97f528ab726a0c880f1c4369e57f74f25f22fc7ddf25551ca6f75bc7cd8fefd9aaacd +SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.131.tar.bz2) = ed1e8e1611fedfd26fe2ff7d9506a0e5c5c18296510bb01f00df4406a6971bc17d5568ef1808fc4d5fb9ead360a39edd077f73854b5ea22e7d44c068874b54d8 +SHA512 (kernel-kabi-dw-5.11.0-0.rc4.131.tar.bz2) = eab931894f70e2d540d3a6b3090c803acdd4beecc8822b53d435f618a5fd140143f140bd1e16f90a3ec3f49ca8c7f8427da6ec2da1b02711f579be7da8ed3090