summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-01-28 15:05:19 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-01-28 15:05:19 -0600
commita17e23ddd3096f037d4561f11c31f5b965555254 (patch)
treee04cc1b351d607f12c0df6439469aaeb495df3a1
parentb0adfd4b4f0981efd2bf936bb3be4e0e005607df (diff)
downloadkernel-a17e23ddd3096f037d4561f11c31f5b965555254.tar.gz
kernel-a17e23ddd3096f037d4561f11c31f5b965555254.tar.xz
kernel-a17e23ddd3096f037d4561f11c31f5b965555254.zip
kernel-5.11.0-0.rc5.20210128git76c057c84d28.137
* Thu Jan 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210128git76c057c84d28.137] - Turn off CONFIG_VIRTIO_CONSOLE for s390x zfcpdump (Justin M. Forbes) - redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski) - redhat: add genlog.py script (Herton R. Krzesinski) - Turn off vdso_install for ppc (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rwxr-xr-xkernel.spec19
-rw-r--r--sources6
3 files changed, 16 insertions, 11 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index f633d0da8..4ad6129f1 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 = 136
+RHEL_RELEASE = 137
#
# Early y+1 numbering
diff --git a/kernel.spec b/kernel.spec
index 1da30bbca..1dbd91099 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.rc5.20210127git2ab38c17aac1.136
+%global distro_build 0.rc5.20210128git76c057c84d28.137
%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.rc5.20210127git2ab38c17aac1.136
+%define pkgrelease 0.rc5.20210128git76c057c84d28.137
# This is needed to do merge window version magic
%define patchlevel 11
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc5.20210127git2ab38c17aac1.136%{?buildid}%{?dist}
+%define specrelease 0.rc5.20210128git76c057c84d28.137%{?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-20210127git2ab38c17aac1.tar.xz
+Source0: linux-20210128git76c057c84d28.tar.xz
Source1: Makefile.rhelver
@@ -1246,8 +1246,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20210127git2ab38c17aac1 -c
-mv linux-20210127git2ab38c17aac1 linux-%{KVERREL}
+%setup -q -n kernel-20210128git76c057c84d28 -c
+mv linux-20210128git76c057c84d28 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2735,11 +2735,16 @@ fi
#
#
%changelog
-* Wed Jan 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210127git2ab38c17aac1.136]
+* Thu Jan 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210128git76c057c84d28.137]
+- Turn off CONFIG_VIRTIO_CONSOLE for s390x zfcpdump (Justin M. Forbes)
- redhat: replace inline awk script with genlog.py call (Herton R. Krzesinski)
- redhat: add genlog.py script (Herton R. Krzesinski)
- Turn off vdso_install for ppc (Justin M. Forbes)
+* Thu Jan 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210128git76c057c84d28.136]
+- Keep VIRTIO_CONSOLE on s390x available. (=?UTF-8?q?Jakub=20=C4=8Cajka?=)
+- New configs in drivers/clk ("Justin M. Forbes")
+
* Wed Jan 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc5.20210127git2ab38c17aac1.135]
- New configs in lib/Kconfig.debug (Jeremy Cline)
diff --git a/sources b/sources
index 5a2eff105..2cf5e8c88 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20210127git2ab38c17aac1.tar.xz) = ed1f34adf9d0e09d4e49bf466cbacffe2ab734c866da3221408a8c34eb1f084a569a69a3709b622ae2b3267b10b6e94c0c93186474d30d834fb26dc6be79aa33
-SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.20210127git2ab38c17aac1.136.tar.bz2) = 9e09c536375497287a787a2d85399161c608984366ec260f8b35ba053f2f864c48850563d0881b6ca1c1d5a14984ff6a466677ff4df0f263b10fba46c5501c88
-SHA512 (kernel-kabi-dw-5.11.0-0.rc5.20210127git2ab38c17aac1.136.tar.bz2) = 09861dbf128cfa2e07c796f85ccdc0889b347ba072c65facfb969b89b7d5df75c4a884f85e3ce930ae33f6306f9d1b055e14c97052606d4af99d3edfd2e99301
+SHA512 (linux-20210128git76c057c84d28.tar.xz) = b44423341c6f033e3a49458d1262a9ca97201e91191db2722d60be11e0f3ed6f06e56329b4119a81fe72108fc6a3353f3e8d011145d73d798f4f3104ed50a564
+SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.20210128git76c057c84d28.137.tar.bz2) = d7c3f07d1e438a04b6a389bcf596e34cf5a1de6cfba387b43ffdc165e987e5442ec5e0efd1cc22cd2e6807847615f898595e8919535bacd9e8fd448458c0a342
+SHA512 (kernel-kabi-dw-5.11.0-0.rc5.20210128git76c057c84d28.137.tar.bz2) = a6f8f2b40e0fc77ea4a339026f1c7ac0c9380aee7f9238d71cd81a0a2b47766ee166a7cc895ba1810a2071ccf45d4aedd839c97cbeee09f1953186a4b99c9c4f