kernel-5.11.0-0.rc7.150.el9

* Wed Feb 10 2021 Herton R. Krzesinski <herton@redhat.com> [5.11.0-0.rc7.150] - v5.11-rc7-2-ge0756cfc7d7c rebase - Fix trailing white space in redhat/configs/fedora/generic/CONFIG_SND_INTEL_BYT_PREFER_SOF (Justin M. Forbes) - Add a redhat/rebase-notes.txt file (Hans de Goede) - Turn on SND_INTEL_BYT_PREFER_SOF for Fedora (Hans de Goede) - ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option (Hans de Goede) [1924101] - CI: Drop MR ID from the name variable (Veronika Kabatova) Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2021-02-10 10:49:04 -05:00 · 2021-02-10 10:49:04 -05:00 · a0a2534c79
commit a0a2534c79
parent 8f6be103a4
27 changed files with 60 additions and 14 deletions
--- 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 = 149
+RHEL_RELEASE = 150

 #
 # Early y+1 numbering
--- a/Patchlist.changelog
+++ b/Patchlist.changelog
@ -1,5 +1,8 @@
-https://gitlab.com/cki-project/kernel-ark/-/commit/67dabe40324eee91aa9f135391ca7b0eb9a7e069
- 67dabe40324eee91aa9f135391ca7b0eb9a7e069 Bluetooth: L2CAP: Try harder to accept device not knowing options
+https://gitlab.com/cki-project/kernel-ark/-/commit/5bd5db57713dba41e3a6df6538c4c3063aa53fb7
+ 5bd5db57713dba41e3a6df6538c4c3063aa53fb7 Bluetooth: L2CAP: Try harder to accept device not knowing options
+
+https://gitlab.com/cki-project/kernel-ark/-/commit/06219afd635737bfee1a7c676258e66448f133e2
+ 06219afd635737bfee1a7c676258e66448f133e2 ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option

 https://gitlab.com/cki-project/kernel-ark/-/commit/035ea4b6c436e53b4c9e388bc65c965f310e216c
 035ea4b6c436e53b4c9e388bc65c965f310e216c redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@ -6432,6 +6432,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 # CONFIG_SND_KIRKWOOD_SOC is not set
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -5131,6 +5131,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 # CONFIG_SND is not set
 CONFIG_SND_KORG1212=m
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@ -6409,6 +6409,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 # CONFIG_SND_KIRKWOOD_SOC is not set
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -5110,6 +5110,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 # CONFIG_SND is not set
 CONFIG_SND_KORG1212=m
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@ -6591,6 +6591,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@ -6569,6 +6569,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@ -6396,6 +6396,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@ -6374,6 +6374,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@ -5802,6 +5802,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KORG1212=m
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@ -5780,6 +5780,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KORG1212=m
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@ -5470,6 +5470,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KORG1212=m
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -4975,6 +4975,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LAYLA20=m
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@ -5447,6 +5447,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KORG1212=m
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -4958,6 +4958,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LAYLA20=m
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@ -5413,6 +5413,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KORG1212=m
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -4919,6 +4919,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LAYLA20=m
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@ -5390,6 +5390,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KORG1212=m
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -4902,6 +4902,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LAYLA20=m
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -4931,6 +4931,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LAYLA20=m
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@ -5846,6 +5846,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KORG1212=m
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -5127,6 +5127,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LAYLA20=m
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@ -5824,6 +5824,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_INTEL_BYT_PREFER_SOF=y
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_JACK=y
 CONFIG_SND_KORG1212=m
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -5107,6 +5107,7 @@ CONFIG_SND_INDIGOIOX=m
 CONFIG_SND_INDIGO=m
 CONFIG_SND_INTEL8X0=m
 CONFIG_SND_INTEL8X0M=m
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
 CONFIG_SND_ISIGHT=m
 CONFIG_SND_KORG1212=m
 CONFIG_SND_LAYLA20=m
--- 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.rc7.149
+%global distro_build 0.rc7.150

 %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.rc7.149
+%define pkgrelease 0.rc7.150

 # This is needed to do merge window version magic
 %define patchlevel 11

 # allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc7.149%{?buildid}%{?dist}
+%define specrelease 0.rc7.150%{?buildid}%{?dist}

 %define pkg_release %{specrelease}

@ -396,6 +396,7 @@ Summary: The Linux kernel
 %define hdrarch s390
 %define all_arch_configs kernel-%{version}-s390x.config
 %define kernel_image arch/s390/boot/bzImage
+%define vmlinux_decompressor arch/s390/boot/compressed/vmlinux
 %endif

 %ifarch %{arm}
@ -601,7 +602,7 @@ BuildRequires: asciidoc
 # exact git commit you can run
 #
 # xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.11.0-0.rc7.149.tar.xz
+Source0: linux-5.11.0-0.rc7.150.tar.xz

 Source1: Makefile.rhelver

@ -1249,8 +1250,8 @@ ApplyOptionalPatch()
  fi
 }

-%setup -q -n kernel-5.11.0-0.rc7.149 -c
-mv linux-5.11.0-0.rc7.149 linux-%{KVERREL}
+%setup -q -n kernel-5.11.0-0.rc7.150 -c
+mv linux-5.11.0-0.rc7.150 linux-%{KVERREL}

 cd linux-%{KVERREL}
 cp -a %{SOURCE1} .
@ -1811,6 +1812,16 @@ BuildKernel() {
    #
    mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
    cp vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
+    if [ -n "%{vmlinux_decompressor}" ]; then
+	    eu-readelf -n  %{vmlinux_decompressor} | grep "Build ID" | awk '{print $NF}' > vmlinux.decompressor.id
+	    # Without build-id the build will fail. But for s390 the build-id
+	    # wasn't added before 5.11. In case it is missing prefer not
+	    # packaging the debuginfo over a build failure.
+	    if [ -s vmlinux.decompressor.id ]; then
+		    cp vmlinux.decompressor.id $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/vmlinux.decompressor.id
+		    cp %{vmlinux_decompressor} $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux.decompressor
+	    fi
+    fi
 %endif

    find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames
@ -2751,10 +2762,19 @@ fi
 #
 #
 %changelog
-* Mon Feb 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.149]
- v5.11-rc7 rebase
+* Wed Feb 10 2021 Herton R. Krzesinski <herton@redhat.com> [5.11.0-0.rc7.150]
+- v5.11-rc7-2-ge0756cfc7d7c rebase
+
+* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.150]
 - Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera)

+* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.149]
+- Fix trailing white space in redhat/configs/fedora/generic/CONFIG_SND_INTEL_BYT_PREFER_SOF (Justin M. Forbes)
+- Add a redhat/rebase-notes.txt file (Hans de Goede)
+- Turn on SND_INTEL_BYT_PREFER_SOF for Fedora (Hans de Goede)
+- ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option (Hans de Goede) [1924101]
+- CI: Drop MR ID from the name variable (Veronika Kabatova)
+
 * Mon Feb 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.148]
 - redhat: add DUP and kpatch certificates to system trusted keys for RHEL build (Herton R. Krzesinski)

--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-5.11.0-0.rc7.149.tar.xz) = a1c2b992a537888c21b43f2b74aefaccf64759f43b91ccaae1011d11c58f381df6b0750f21f0dca483ab81413132902b6e2058490ac62600540ed4e27ef648b1
-SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.149.tar.bz2) = 68f8d7a38c46f2760b277a0d73bfa5a2fd21b79eaca42f5b8df1297bd6f225e16cee6dffd07e225e2208b883609a3503f0d89ffeeb8be526ce8f8c092a7d45cb
-SHA512 (kernel-kabi-dw-5.11.0-0.rc7.149.tar.bz2) = 21c7de769e93075d14eec189e85b89df851118732663ebb4493c3350b2a8278bcc8bf2895e3871bb2562d120e27ba8177ef26d39314ff25c20cf61efec94b8f0
+SHA512 (linux-5.11.0-0.rc7.150.tar.xz) = 4a77eb92cdecab2566e243133fe2d9dc8e277e06590d9a4f7155b93001c701b5ce7c00f8b653a60bb22d9a585b3a0baea509faf5bdc17f4f93d824df5d384650
+SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.150.tar.bz2) = 288366d9bba47d85ea8d90355c53007edaf5e34e25d297c7f10549feba0f4ac8cf9a1ed27cd63a4144384fb8c7d7ac58ee35218fbd9816ff83e82724496915bf
+SHA512 (kernel-kabi-dw-5.11.0-0.rc7.150.tar.bz2) = a9c2e4f20c694e71ee1c01136909fcd8170dc6b203cc095c6ef4879cee73126dea03e5ba4fa140030ba922caef7435602b9bb56a491fe76e73b71b2dc1990deb