summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2021-03-09 12:40:20 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2021-03-09 12:40:20 -0600
commit5d0d02f1e448387d47b9d039573c46139ab2c48c (patch)
tree2cb5da667be5797b8702019897a2f9ef370328dd
parentec33e5d539ad6a99b3d62dd82262030aee3d6298 (diff)
downloadkernel-5d0d02f1e448387d47b9d039573c46139ab2c48c.zip
kernel-5d0d02f1e448387d47b9d039573c46139ab2c48c.tar.gz
kernel-5d0d02f1e448387d47b9d039573c46139ab2c48c.tar.xz
kernel-5.11.5-7
* Tue Mar 09 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.5-7] - Turn on SND_SOC_INTEL_SOUNDWIRE_SOF_MACH for Fedora again (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
-rw-r--r--Makefile.rhelver2
-rw-r--r--kernel-aarch64-debug-fedora.config2
-rw-r--r--kernel-aarch64-fedora.config2
-rw-r--r--kernel-armv7hl-debug-fedora.config2
-rw-r--r--kernel-armv7hl-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-debug-fedora.config2
-rw-r--r--kernel-armv7hl-lpae-fedora.config2
-rw-r--r--kernel-i686-debug-fedora.config2
-rw-r--r--kernel-i686-fedora.config2
-rw-r--r--kernel-ppc64le-debug-fedora.config2
-rw-r--r--kernel-ppc64le-fedora.config2
-rw-r--r--kernel-s390x-debug-fedora.config2
-rw-r--r--kernel-s390x-fedora.config2
-rw-r--r--kernel-x86_64-debug-fedora.config2
-rw-r--r--kernel-x86_64-fedora.config2
-rwxr-xr-xkernel.spec11
-rw-r--r--patch-5.11-redhat.patch2
-rw-r--r--sources6
18 files changed, 26 insertions, 23 deletions
diff --git a/Makefile.rhelver b/Makefile.rhelver
index 6fa6276..cca8dcf 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 = 6
+RHEL_RELEASE = 7
#
# Early y+1 numbering
diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config
index 49fa569..3741e76 100644
--- a/kernel-aarch64-debug-fedora.config
+++ b/kernel-aarch64-debug-fedora.config
@@ -6582,7 +6582,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config
index d90f2ab..e9788ec 100644
--- a/kernel-aarch64-fedora.config
+++ b/kernel-aarch64-fedora.config
@@ -6558,7 +6558,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config
index 18a5abb..0046817 100644
--- a/kernel-armv7hl-debug-fedora.config
+++ b/kernel-armv7hl-debug-fedora.config
@@ -6754,7 +6754,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
CONFIG_SND_SOC_LPASS_CPU=m
CONFIG_SND_SOC_LPASS_PLATFORM=m
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config
index 1c03372..ae648b2 100644
--- a/kernel-armv7hl-fedora.config
+++ b/kernel-armv7hl-fedora.config
@@ -6731,7 +6731,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
CONFIG_SND_SOC_LPASS_CPU=m
CONFIG_SND_SOC_LPASS_PLATFORM=m
diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config
index b9e2cd8..936daa1 100644
--- a/kernel-armv7hl-lpae-debug-fedora.config
+++ b/kernel-armv7hl-lpae-debug-fedora.config
@@ -6552,7 +6552,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 9cbd851..02e9375 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -6529,7 +6529,7 @@ CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config
index 824dc0a..53d1baa 100644
--- a/kernel-i686-debug-fedora.config
+++ b/kernel-i686-debug-fedora.config
@@ -5967,7 +5967,7 @@ CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
CONFIG_SND_SOC_INTEL_SST_ACPI=m
CONFIG_SND_SOC_INTEL_SST=m
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config
index edf1039..f212b13 100644
--- a/kernel-i686-fedora.config
+++ b/kernel-i686-fedora.config
@@ -5944,7 +5944,7 @@ CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
CONFIG_SND_SOC_INTEL_SST_ACPI=m
CONFIG_SND_SOC_INTEL_SST=m
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config
index 5af23c1..235cfa0 100644
--- a/kernel-ppc64le-debug-fedora.config
+++ b/kernel-ppc64le-debug-fedora.config
@@ -5593,7 +5593,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
# CONFIG_SND_SOC is not set
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config
index 7557f70..56bef3a 100644
--- a/kernel-ppc64le-fedora.config
+++ b/kernel-ppc64le-fedora.config
@@ -5569,7 +5569,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
# CONFIG_SND_SOC is not set
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config
index 930b37d..f2c5abc 100644
--- a/kernel-s390x-debug-fedora.config
+++ b/kernel-s390x-debug-fedora.config
@@ -5535,7 +5535,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config
index 8feb5f0..1fc6b31 100644
--- a/kernel-s390x-fedora.config
+++ b/kernel-s390x-fedora.config
@@ -5511,7 +5511,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
# CONFIG_SND_SOC_LPASS_VA_MACRO is not set
# CONFIG_SND_SOC_LPASS_WSA_MACRO is not set
diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config
index 9141c18..c2918d4 100644
--- a/kernel-x86_64-debug-fedora.config
+++ b/kernel-x86_64-debug-fedora.config
@@ -6012,7 +6012,7 @@ CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
CONFIG_SND_SOC_INTEL_SST_ACPI=m
CONFIG_SND_SOC_INTEL_SST=m
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config
index 6603327..0e1a2df 100644
--- a/kernel-x86_64-fedora.config
+++ b/kernel-x86_64-fedora.config
@@ -5989,7 +5989,7 @@ CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
-# CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH is not set
+CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
CONFIG_SND_SOC_INTEL_SST_ACPI=m
CONFIG_SND_SOC_INTEL_SST=m
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
diff --git a/kernel.spec b/kernel.spec
index 58cf416..2da3db4 100755
--- a/kernel.spec
+++ b/kernel.spec
@@ -104,7 +104,7 @@ Summary: The Linux kernel
%define primary_target rhel
%endif
-%define rpmversion 5.11.4
+%define rpmversion 5.11.5
%define stableversion 5.11
%define pkgrelease 50
@@ -603,7 +603,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.11.4.tar.xz
+Source0: linux-5.11.5.tar.xz
Source1: Makefile.rhelver
@@ -1251,8 +1251,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.11.4 -c
-mv linux-5.11.4 linux-%{KVERREL}
+%setup -q -n kernel-5.11.5 -c
+mv linux-5.11.5 linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@@ -2763,6 +2763,9 @@ fi
#
#
%changelog
+* Tue Mar 09 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.5-7]
+- Turn on SND_SOC_INTEL_SOUNDWIRE_SOF_MACH for Fedora again (Justin M. Forbes)
+
* Sun Mar 07 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.11.4-6]
- PCI: Add MCFG quirks for Tegra194 host controllers (Vidya Sagar)
- Revert "PCI: Add MCFG quirks for Tegra194 host controllers" (Peter Robinson)
diff --git a/patch-5.11-redhat.patch b/patch-5.11-redhat.patch
index 98ee173..ef4e2d6 100644
--- a/patch-5.11-redhat.patch
+++ b/patch-5.11-redhat.patch
@@ -129,7 +129,7 @@ index 000000000000..b27bcf11198f
+
+...
diff --git a/Makefile b/Makefile
-index cb9a8e823951..2b1b03c782b7 100644
+index 1673c12fb4b3..2dc0fb2e035b 100644
--- a/Makefile
+++ b/Makefile
@@ -494,6 +494,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE
diff --git a/sources b/sources
index e308ec7..2ca4be9 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
SHA512 (patch-5.10.6.xz) = 54e74994a27b6a753717c778e5a550fd5db0f4acd24095f9b6e6d7cbb5c914be2f914d34865c9453d85a37873f0575fc5af54374ea1fe6e6d313d978e739d58f
-SHA512 (linux-5.11.4.tar.xz) = a92f0d6359ad0237422a9d3331e4b9b0d9f17e51f5d297b34f3ebcec33218b32a9452d50ba084871d56f52df50830d8a4da1c045f8cfceb2c27512c2f7398858
-SHA512 (kernel-abi-whitelists-5.11.4-50.tar.bz2) = 45ee25fb63cd1afff261c2a0770193c00657897f8b85be305e507892b516dc1ec5e69c7e9b139bf80fc2d454feebd0015f393f37ae260313f9a723fe28df7912
-SHA512 (kernel-kabi-dw-5.11.4-50.tar.bz2) = 8785a9550722e081e6155edaa275dec9018fd9f7d0d5585daef3f4793f6246846b28553f0fa8ea35005262b550689292c6d4c314fb6b1f4c31afc64f27829c1d
+SHA512 (linux-5.11.5.tar.xz) = 135bd94a8944ecf87ffcf884a36cc7ffd2c206464ae46a93606c90b022a62ce0eb922b0bed06d69a3ccd8f09231ee798d12268ab1c7519621208a7e3e080c48f
+SHA512 (kernel-abi-whitelists-5.11.5-50.tar.bz2) = 0353aecca8d3d1fa2720eccc442e6901962291fef5546d0a818fdddbb5c6e1b1704deb4ed7ad2aa8d770979804b5db229ecffb207b5ab49fcbcba29a88c793e4
+SHA512 (kernel-kabi-dw-5.11.5-50.tar.bz2) = db4c9c43ecb610e71463a7dfa94fee2f3f3667347a5ccdcad402935f4c2b5614864254a0960b6f07302dbfa8c8ac00b5af98ce9255081dc1aa4daca05dee2efe