summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-02-10 18:37:59 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2021-02-10 18:37:59 +0100
commit0d0088efb21295bb6db06b5d09deee0c9c4a9aca (patch)
treeea277faef48db72ccf4df60f97b5b8ceedac039f
parent73bdef07f8e6143065d07921330edb8586a93f9e (diff)
parenta60f42e5b80ac2c9c3e9c0d47958a8cd3fdf933a (diff)
downloadkernel-0d0088efb21295bb6db06b5d09deee0c9c4a9aca.tar.gz
kernel-0d0088efb21295bb6db06b5d09deee0c9c4a9aca.tar.xz
kernel-0d0088efb21295bb6db06b5d09deee0c9c4a9aca.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc7.20210210gite0756cfc7d7c.150.vanilla.1.fc33
-rw-r--r--Makefile.rhelver2
-rw-r--r--Patchlist.changelog7
-rw-r--r--kernel-aarch64-debug-fedora.config1
-rw-r--r--kernel-aarch64-debug-rhel.config1
-rw-r--r--kernel-aarch64-fedora.config1
-rw-r--r--kernel-aarch64-rhel.config1
-rw-r--r--kernel-armv7hl-debug-fedora.config1
-rw-r--r--kernel-armv7hl-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config1
-rw-r--r--kernel-armv7hl-lpae-fedora.config1
-rw-r--r--kernel-i686-debug-fedora.config1
-rw-r--r--kernel-i686-fedora.config1
-rw-r--r--kernel-ppc64le-debug-fedora.config1
-rw-r--r--kernel-ppc64le-debug-rhel.config1
-rw-r--r--kernel-ppc64le-fedora.config1
-rw-r--r--kernel-ppc64le-rhel.config1
-rw-r--r--kernel-s390x-debug-fedora.config1
-rw-r--r--kernel-s390x-debug-rhel.config1
-rw-r--r--kernel-s390x-fedora.config1
-rw-r--r--kernel-s390x-rhel.config1
-rw-r--r--kernel-s390x-zfcpdump-rhel.config1
-rw-r--r--kernel-x86_64-debug-fedora.config1
-rw-r--r--kernel-x86_64-debug-rhel.config1
-rw-r--r--kernel-x86_64-fedora.config1
-rw-r--r--kernel-x86_64-rhel.config1
-rwxr-xr-xkernel.spec34
-rw-r--r--patch-5.11.0-redhat.patch78
-rw-r--r--sources6
28 files changed, 135 insertions, 15 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index d0a2c1840..57aae48c9 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 = 149
+RHEL_RELEASE = 150
#
# Early y+1 numbering
diff --git a/Patchlist.changelog b/Patchlist.changelog
index 5a5f3cbaf..42a7e636c 100644
--- 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
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 84543a089..21114d5c4 100644
--- 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
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config
index b4bcfda90..e9e800623 100644
--- 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
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index aa0cfa6da..cc9324224 100644
--- 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
diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config
index 5d64692c1..3d83e05b0 100644
--- 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
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 6b2ab1003..8f7b802ba 100644
--- 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
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 87cd89ec9..ce04da3a3 100644
--- 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
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index 0a2eb6b5f..a93f7295d 100644
--- 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
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index d27aa1982..a682793a9 100644
--- 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
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 6f00cbded..f4d3f3502 100644
--- 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
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index 21d87ce8e..2f1d325d4 100644
--- 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
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 89c8ef394..2725fe430 100644
--- 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
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config
index acfa805b6..ea40e69a5 100644
--- 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
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 64d4d5b12..0c4e14062 100644
--- 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
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config
index 47be44676..2d9da0290 100644
--- 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
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 2cd169110..cf6b91672 100644
--- 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
diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index b466098b1..d137e650b 100644
--- 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
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 3fc51eec2..e71224275 100644
--- 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
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config
index 1c2e674e7..3f429663a 100644
--- 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
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index ec68c7fc8..cd0e1067b 100644
--- 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
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 7b1660c3a..d04491da8 100644
--- 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
diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config
index b6453d558..e19c447ea 100644
--- 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
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index fe10dea18..97a93ff7f 100644
--- 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
diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config
index ce88defe1..9b1461490 100644
--- 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
diff --git a/kernel.spec b/kernel.spec
index c34403d92..8ffefb10e 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.rc7.149
+%global distro_build 0.rc7.20210210gite0756cfc7d7c.150
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -107,13 +107,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.11.0
-%define pkgrelease 0.rc7.149
+%define pkgrelease 0.rc7.20210210gite0756cfc7d7c.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.20210210gite0756cfc7d7c.150%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -203,7 +203,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# The kernel tarball/base version
%define kversion 5.11
@@ -398,6 +398,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}
@@ -603,7 +604,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.11-rc7.tar.xz
+Source0: linux-20210210gite0756cfc7d7c.tar.xz
Source1: Makefile.rhelver
@@ -1252,8 +1253,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.11-rc7 -c
-mv linux-5.11-rc7 linux-%{KVERREL}
+%setup -q -n kernel-20210210gite0756cfc7d7c -c
+mv linux-20210210gite0756cfc7d7c linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -1814,6 +1815,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
@@ -2745,9 +2756,16 @@ fi
#
#
%changelog
-* Mon Feb 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.149]
+* 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)
diff --git a/patch-5.11.0-redhat.patch b/patch-5.11.0-redhat.patch
index f59088ae8..593698624 100644
--- a/patch-5.11.0-redhat.patch
+++ b/patch-5.11.0-redhat.patch
@@ -69,7 +69,9 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
- 71 files changed, 1580 insertions(+), 188 deletions(-)
+ sound/hda/Kconfig | 14 +
+ sound/hda/intel-dsp-config.c | 29 +-
+ 73 files changed, 1606 insertions(+), 205 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@@ -3088,3 +3090,77 @@ index 7b09cfbae94f..e1c7bda4de13 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
+diff --git a/sound/hda/Kconfig b/sound/hda/Kconfig
+index 3bc9224d5e4f..9ed5cfa3c18c 100644
+--- a/sound/hda/Kconfig
++++ b/sound/hda/Kconfig
+@@ -46,3 +46,17 @@ config SND_INTEL_DSP_CONFIG
+ select SND_INTEL_NHLT if ACPI
+ # this config should be selected only for Intel DSP platforms.
+ # A fallback is provided so that the code compiles in all cases.
++
++config SND_INTEL_BYT_PREFER_SOF
++ bool "Prefer SOF driver over SST on BY/CHT platforms"
++ depends on SND_SST_ATOM_HIFI2_PLATFORM_ACPI && SND_SOC_SOF_BAYTRAIL
++ default n
++ help
++ The kernel has 2 drivers for the Low Power Engine audio-block on
++ Bay- and Cherry-Trail SoCs. The old SST driver and the new SOF
++ driver. If both drivers are enabled then the kernel will default
++ to using the old SST driver, unless told otherwise through the
++ snd_intel_dspcfg.dsp_driver module-parameter.
++
++ Set this option to Y to make the kernel default to the new SOF
++ driver instead.
+diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
+index c45686172517..68bb977c6a37 100644
+--- a/sound/hda/intel-dsp-config.c
++++ b/sound/hda/intel-dsp-config.c
+@@ -452,35 +452,30 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci)
+ }
+ EXPORT_SYMBOL_GPL(snd_intel_dsp_driver_probe);
+
++/* Should we default to SOF or SST for BYT/CHT ? */
++#if IS_ENABLED(CONFIG_SND_INTEL_BYT_PREFER_SOF) || \
++ !IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI)
++#define FLAG_SST_OR_SOF_BYT FLAG_SOF
++#else
++#define FLAG_SST_OR_SOF_BYT FLAG_SST
++#endif
++
+ /*
+ * configuration table
+ * - the order of similar ACPI ID entries is important!
+ * - the first successful match will win
+ */
+ static const struct config_entry acpi_config_table[] = {
++#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI) || \
++ IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
+ /* BayTrail */
+-#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI)
+- {
+- .flags = FLAG_SST,
+- .acpi_hid = "80860F28",
+- },
+-#endif
+-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
+ {
+- .flags = FLAG_SOF,
++ .flags = FLAG_SST_OR_SOF_BYT,
+ .acpi_hid = "80860F28",
+ },
+-#endif
+ /* CherryTrail */
+-#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI)
+- {
+- .flags = FLAG_SST,
+- .acpi_hid = "808622A8",
+- },
+-#endif
+-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
+ {
+- .flags = FLAG_SOF,
++ .flags = FLAG_SST_OR_SOF_BYT,
+ .acpi_hid = "808622A8",
+ },
+ #endif
diff --git a/sources b/sources
index f129b56e3..f2c56ee06 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.11-rc7.tar.xz) = b1f2faf38d81866d4d0d5e3448fa009a6615ec1a7e3d15fd241b2353547205406c16cea0ff031c3da3c83012a912a16dcee891bf0c01be00512a3cbcd7835e62
-SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.149.tar.bz2) = a22d8336949f3fa16131bde38542300c29da85d76d8154530b1268c483fb73a705b57991c855454f7b0d550e40b7e251d17dea7428eaaa7156ad1ebd9279a7eb
-SHA512 (kernel-kabi-dw-5.11.0-0.rc7.149.tar.bz2) = 204c8dddb1a844520af822ac9eb737803099035d0692fc78fa21dc7c5d0ec6d3a1d0dd134a80cb50580287dbf69b3124c6016e7a4875831eb6b63a6be443ac88
+SHA512 (linux-20210210gite0756cfc7d7c.tar.xz) = fa89f72e7175f26ea2f3e0439bf1488ba813ccebadbf4218f063316bcbd1333a442f1ef4ec102fac8dd434dcd4f7b15748a0ab5c0165d734caa9bbed0fad0b85
+SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.20210210gite0756cfc7d7c.150.tar.bz2) = c53c44ca06406839629d1b26e561762ae3c1a73bf1122c41482817f2a631245ae01e43323e512d384006e14f5f1ee663a0092911933f293224bf958e7c6176c6
+SHA512 (kernel-kabi-dw-5.11.0-0.rc7.20210210gite0756cfc7d7c.150.tar.bz2) = 54ea3805dd27d830da8843606c31abf2958359d6c02b348fc2b672444799a239c43103257e080a4e10034211122779fb5096875542697be138f72d8759f9f3f1