diff --git a/Makefile.rhelver b/Makefile.rhelver index 28534fed7..67321cd8d 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 = 132 +RHEL_RELEASE = 133 # # Early y+1 numbering diff --git a/Patchlist.changelog b/Patchlist.changelog index 971da220c..bd699b871 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/69b08dde2fd74554ec90f5d3a66d4775df65858d - 69b08dde2fd74554ec90f5d3a66d4775df65858d irq: export irq_check_status_bit +https://gitlab.com/cki-project/kernel-ark/-/commit/36cc640a90102bbd934e0728c8926d6b0fcbc32d + 36cc640a90102bbd934e0728c8926d6b0fcbc32d 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 6e962d093..ce7d3ee43 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.132 +%global distro_build 0.rc4.133 %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.132 +%define pkgrelease 0.rc4.133 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.132%{?buildid}%{?dist} +%define specrelease 0.rc4.133%{?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.132.tar.xz +Source0: linux-5.11.0-0.rc4.133.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc4.132 -c -mv linux-5.11.0-0.rc4.132 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc4.133 -c +mv linux-5.11.0-0.rc4.133 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2735,10 +2735,10 @@ fi # # %changelog -* Thu Jan 21 2021 Herton R. Krzesinski [5.11.0-0.rc4.132] -- v5.11-rc4-86-g9791581c049c rebase +* Fri Jan 22 2021 Herton R. Krzesinski [5.11.0-0.rc4.133] +- v5.11-rc4-164-g83d09ad4b950 rebase -* Thu Jan 21 2021 Fedora Kernel Team [5.11.0-0.rc4.20210121git9791581c049c.132] +* Fri Jan 22 2021 Fedora Kernel Team [5.11.0-0.rc4.20210122git83d09ad4b950.133] - 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) diff --git a/sources b/sources index 155ca2943..2cbac8de8 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc4.132.tar.xz) = 877526b3ddb53ebd0d24d01c70f229d28e2b5225de7ec5dce091bb9d8983891902c92c097ec653d62fea393ed0c0c1feaa5a323065622fbfac446d8936033ea7 -SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.132.tar.bz2) = e34e27298a1b24abd95c1713dd0e947aa60e42893a6dfdbdc44db2c3ca593e634f527278eec5c19e382b7a5e834de14dcb4d4d427173bdffc0d6fe030c4f017c -SHA512 (kernel-kabi-dw-5.11.0-0.rc4.132.tar.bz2) = fc449a6d8bf1fcd3840521114a3a8b6fe139a582c8881c23410f01e3b859a4e7b4c342d5fe4df124ba81595c0388b5b76e30c833a7f92d31766c663487c67eb1 +SHA512 (linux-5.11.0-0.rc4.133.tar.xz) = 2c39193c93eabdc4455afd0bbdbb7253f2a70eeadcc8c0fcb3127094a34e43a202e6910f56c1f05e64669235d4906be59234cf47b15f06e8e75db1060cfdbdf0 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc4.133.tar.bz2) = 60365b54e1109a512ec10c4255ab28dd81997b01c2f099e8cf1e638fd2d6ba9dc1d42b95427d8ccaa76021eb7543ab8249ce637f77846c05c0190524b9e996c5 +SHA512 (kernel-kabi-dw-5.11.0-0.rc4.133.tar.bz2) = 63bdda82d67a5d6d41ea18c9ff1b5d3e04c5005231d55087f11b3227e31ee481f41545260e6d44c72a421e5fa32f75952a5aea5fa48aadaaa4a4ac3f001aaa10