From 0b681cdcc6478a3c27b1b546d899901674e64271 Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Fri, 29 Jan 2021 08:23:12 -0500 Subject: [PATCH] kernel-5.11.0-0.rc5.138.el9 * Fri Jan 29 2021 Herton R. Krzesinski [5.11.0-0.rc5.138] - v5.11-rc5-239-gbec4c2968fce rebase Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-debug-rhel.config | 1 + kernel-aarch64-fedora.config | 1 + kernel-aarch64-rhel.config | 1 + kernel-armv7hl-debug-fedora.config | 1 + kernel-armv7hl-fedora.config | 1 + kernel-armv7hl-lpae-debug-fedora.config | 1 + kernel-armv7hl-lpae-fedora.config | 1 + kernel-ppc64le-debug-fedora.config | 1 + kernel-ppc64le-debug-rhel.config | 1 + kernel-ppc64le-fedora.config | 1 + kernel-ppc64le-rhel.config | 1 + kernel-s390x-debug-fedora.config | 1 + kernel-s390x-debug-rhel.config | 1 + kernel-s390x-fedora.config | 1 + kernel-s390x-rhel.config | 1 + kernel-s390x-zfcpdump-rhel.config | 1 + kernel-x86_64-debug-rhel.config | 1 + kernel-x86_64-rhel.config | 1 + kernel.spec | 22 ++++++++++++---------- sources | 6 +++--- 22 files changed, 35 insertions(+), 14 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 4ad6129f1..00fe72e9b 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 = 137 +RHEL_RELEASE = 138 # # Early y+1 numbering diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 2016f5f21..08c796fee 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6662,6 +6662,7 @@ CONFIG_SND_SOC_SOF_HDA_PROBES=y CONFIG_SND_SOC_SOF_IMX8M_SUPPORT=y CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set CONFIG_SND_SOC_SOF_OF=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 376e3085b..8c84f6e2b 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5292,6 +5292,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_DEBUG_PROBES=y # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 07428359c..c5e5b7554 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6637,6 +6637,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_IMX8M_SUPPORT=y CONFIG_SND_SOC_SOF_IMX8_SUPPORT=y CONFIG_SND_SOC_SOF_IMX_TOPLEVEL=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set CONFIG_SND_SOC_SOF_OF=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index e355d2c89..c1956ad50 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5269,6 +5269,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index c7464e8cb..4f583bfa2 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -6840,6 +6840,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 2f8f79344..c6b7c4919 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6818,6 +6818,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 1c51ad499..bc39766b6 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6632,6 +6632,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index d49510d1c..2ecd9d176 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6610,6 +6610,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 3f94c4417..c986291d8 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5650,6 +5650,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 2165d2d70..4004e8abe 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -5138,6 +5138,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_DEBUG_PROBES=y # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 2f05413c8..46812a82f 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5627,6 +5627,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index a61f7792c..de01facb4 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -5119,6 +5119,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index e37706292..d40963672 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5592,6 +5592,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index ef303cc24..8185b8de5 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -5081,6 +5081,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_DEBUG_PROBES=y # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set CONFIG_SND_SOC_SOF_HDA_PROBES=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 45a9a2392..f337cd9ea 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5569,6 +5569,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 91fece993..44fe818e5 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -5062,6 +5062,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index a92a429c0..0acd3b6a7 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -5091,6 +5091,7 @@ CONFIG_SND_SOC_SOF_ALDERLAKE_SUPPORT=y # CONFIG_SND_SOC_SOF_DEBUG is not set # CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set # CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set # CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set # CONFIG_SND_SOC_SOF_OF is not set CONFIG_SND_SOC_SOF_PCI=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index ae500fcb8..2e3ae8c12 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5327,6 +5327,7 @@ CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC=y CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_HDA_PROBES=y CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y # CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT is not set CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 7f9fdda72..0210573e9 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -5305,6 +5305,7 @@ CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y CONFIG_SND_SOC_SOF_HDA_COMMON_HDMI_CODEC=y CONFIG_SND_SOC_SOF_HDA_LINK=y CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y +# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y # CONFIG_SND_SOC_SOF_JASPERLAKE_SUPPORT is not set CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y diff --git a/kernel.spec b/kernel.spec index 7bdf5e8da..cbbfc4ed1 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.137 +%global distro_build 0.rc5.138 %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.137 +%define pkgrelease 0.rc5.138 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.137%{?buildid}%{?dist} +%define specrelease 0.rc5.138%{?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.137.tar.xz +Source0: linux-5.11.0-0.rc5.138.tar.xz Source1: Makefile.rhelver @@ -1246,8 +1246,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.11.0-0.rc5.137 -c -mv linux-5.11.0-0.rc5.137 linux-%{KVERREL} +%setup -q -n kernel-5.11.0-0.rc5.138 -c +mv linux-5.11.0-0.rc5.138 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2735,15 +2735,17 @@ fi # # %changelog -* Thu Jan 28 2021 Herton R. Krzesinski [5.11.0-0.rc5.137] -- v5.11-rc5-40-g76c057c84d28 rebase +* Fri Jan 29 2021 Herton R. Krzesinski [5.11.0-0.rc5.138] +- v5.11-rc5-239-gbec4c2968fce rebase -* 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) +* Fri Jan 29 2021 Fedora Kernel Team [5.11.0-0.rc5.20210129gitbec4c2968fce.138] - 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) +* Fri Jan 29 2021 Fedora Kernel Team [5.11.0-0.rc5.20210129gitbec4c2968fce.137] +- Turn off CONFIG_VIRTIO_CONSOLE for s390x zfcpdump ("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") diff --git a/sources b/sources index 137d40dc3..6ac32822e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -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 +SHA512 (linux-5.11.0-0.rc5.138.tar.xz) = c7787675b1e7e5bc10ae07bef9039112c5a0348340b33d646448a60d73a8e51af73cb7af6134b0569c202b9adf470caa610d9b03d9854f392305ae936247d1ae +SHA512 (kernel-abi-whitelists-5.11.0-0.rc5.138.tar.bz2) = e89a9527c8b1717cd416bcfdaf5af135e610e5c63b991ff4f2af2e42d54518273159e6812afc68c210d0c9a99e0872548fb95b4d0bbf468d414ef253920692de +SHA512 (kernel-kabi-dw-5.11.0-0.rc5.138.tar.bz2) = 2e448c41945e3769e6e5f9d566908c09192caa9427b55eca8b62e8ba20d80de8c0cce09aec501d755e808a6d0313180e8cfb52c5a633f6496fdd980e658e3e42