From 7168aef850ace0179e7fe5f6e6ec568d596ebf2a Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Thu, 28 Jan 2021 09:02:07 -0500 Subject: [PATCH] kernel-5.11.0-0.rc5.137.el9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Thu Jan 28 2021 Herton R. Krzesinski [5.11.0-0.rc5.137] - v5.11-rc5-40-g76c057c84d28 rebase - Turn off CONFIG_VIRTIO_CONSOLE for s390x zfcpdump (Justin M. Forbes) - Keep VIRTIO_CONSOLE on s390x available. (Jakub Čajka) - New configs in drivers/clk (Justin M. Forbes) Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel.spec | 23 ++++++++++++++--------- sources | 6 +++--- 7 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index f633d0d..4ad6129 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-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 907753e..e377062 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -6730,7 +6730,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set -# CONFIG_VIRTIO_CONSOLE is not set +CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index eb1a4ac..ef303cc 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -6102,7 +6102,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set -# CONFIG_VIRTIO_CONSOLE is not set +CONFIG_VIRTIO_CONSOLE=y # CONFIG_VIRTIO_FS is not set CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 755f862..45a9a23 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -6707,7 +6707,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set -# CONFIG_VIRTIO_CONSOLE is not set +CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 92d0786..91fece9 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -6083,7 +6083,7 @@ CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_BLK=m # CONFIG_VIRTIO_BLK_SCSI is not set -# CONFIG_VIRTIO_CONSOLE is not set +CONFIG_VIRTIO_CONSOLE=y # CONFIG_VIRTIO_FS is not set CONFIG_VIRTIO_INPUT=m # CONFIG_VIRTIO_IOMMU is not set diff --git a/kernel.spec b/kernel.spec index c0d5866..7bdf5e8 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.136 +%global distro_build 0.rc5.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.136 +%define pkgrelease 0.rc5.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.136%{?buildid}%{?dist} +%define specrelease 0.rc5.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-5.11.0-0.rc5.136.tar.xz +Source0: linux-5.11.0-0.rc5.137.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc5.136 -c -mv linux-5.11.0-0.rc5.136 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc5.137 -c +mv linux-5.11.0-0.rc5.137 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2735,14 +2735,19 @@ fi # # %changelog -* Wed Jan 27 2021 Herton R. Krzesinski [5.11.0-0.rc5.136] -- v5.11-rc5-37-g2ab38c17aac1 rebase +* Thu Jan 28 2021 Herton R. Krzesinski [5.11.0-0.rc5.137] +- v5.11-rc5-40-g76c057c84d28 rebase -* Wed Jan 27 2021 Fedora Kernel Team [5.11.0-0.rc5.20210127git2ab38c17aac1.136] +* Thu Jan 28 2021 Fedora Kernel Team [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 [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 [5.11.0-0.rc5.20210127git2ab38c17aac1.135] - New configs in lib/Kconfig.debug (Jeremy Cline) diff --git a/sources b/sources index 5636fcc..137d40d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.11.0-0.rc5.136.tar.xz) = 7b9cb1232929dcd767342bfbe328b8517f8efcf04bc665039cc6d9f04c1bfc6af0bbf9945e77d47e550b4c512fc94d4493932789cf6baa6f0c15e1680ab7d46b -SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.136.tar.bz2) = ee93b1abd1bf4b430a3604cf8d580589dd78165541b82fca9b56ac1f549fed5234f46e784a5edaac01a004ccb3d27e904a71a84026562fb664d1abdf0a40cf5b -SHA512 (kernel-kabi-dw-5.11.0-0.rc5.136.tar.bz2) = 12a9d54deadfca21f3a21d31d34d00d6f6692a3426417c497ab599ec127ddafc91e0a0ae07a3426fdfa5eb3d5f2bf4decaa9490bd96e6e3d5bbe11f4c9e7c465 +SHA512 (linux-5.11.0-0.rc5.137.tar.xz) = 612962f59ec9187775149721f4642ac89a4b29e2f29d7d9752d43233ce3377e59e48265586036f356918a783ff8e392749bbe6b2fde8b30f6bb999e665665a27 +SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.137.tar.bz2) = ff7876d6b3333516519700de17e823da45049da54c582b76daa47e9fa1efd1be25a8f21f01e30a351da467e28528f76c8e0a13aad8c0d27613d8f0ad993d53d1 +SHA512 (kernel-kabi-dw-5.11.0-0.rc5.137.tar.bz2) = 5877e86fdd85f2f5e94c3baa5814972f34956dfbc04e8ed2b3beda0d517e118428ff7270e02da7326fb93aed182fefe9b182f5af6b34012e7594636dc15da2a9