summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2020-04-17 11:10:38 -0500
committerJustin M. Forbes <jforbes@fedoraproject.org>2020-04-17 11:10:38 -0500
commit46596990b38e587bc797bef7a775040c41c430d5 (patch)
tree5650e1e91951cb1cc11927827189a3e99c5b6b7a
parent3cb1fbae591ce78ab90422a0d90667ca05b2b066 (diff)
downloadkernel-46596990b38e587bc797bef7a775040c41c430d5.tar.gz
kernel-46596990b38e587bc797bef7a775040c41c430d5.tar.xz
kernel-46596990b38e587bc797bef7a775040c41c430d5.zip
Linux v5.6.5
-rw-r--r--0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch34
-rw-r--r--kernel.spec8
-rw-r--r--sources2
3 files changed, 5 insertions, 39 deletions
diff --git a/0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch b/0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch
deleted file mode 100644
index 9c482f90c..000000000
--- a/0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 672798e7b896ad659009882b7fd3242935c8fcdf Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Thu, 2 Apr 2020 18:02:05 +0200
-Subject: [PATCH] ALSA: hda/realtek - Add quirk for Lenovo Carbon X1 8th gen
-
-The audio setup on the Lenovo Carbon X1 8th gen is the same as that on
-the Lenovo Carbon X1 7th gen, as such it needs the same
-ALC285_FIXUP_THINKPAD_HEADSET_JACK quirk.
-
-This fixes volume control of the speaker not working among other things.
-
-BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1820196
-Cc: stable@vger.kernel.org
-Suggested-by: Jaroslav Kysela <perex@perex.cz>
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- sound/pci/hda/patch_realtek.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
-index 63e1a56f705b..9c3bbf1df93e 100644
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -7299,6 +7299,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
- SND_PCI_QUIRK(0x17aa, 0x225d, "Thinkpad T480", ALC269_FIXUP_LIMIT_INT_MIC_BOOST),
- SND_PCI_QUIRK(0x17aa, 0x2292, "Thinkpad X1 Yoga 7th", ALC285_FIXUP_THINKPAD_HEADSET_JACK),
- SND_PCI_QUIRK(0x17aa, 0x2293, "Thinkpad X1 Carbon 7th", ALC285_FIXUP_THINKPAD_HEADSET_JACK),
-+ SND_PCI_QUIRK(0x17aa, 0x22be, "Thinkpad X1 Carbon 8th", ALC285_FIXUP_THINKPAD_HEADSET_JACK),
- SND_PCI_QUIRK(0x17aa, 0x30bb, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
- SND_PCI_QUIRK(0x17aa, 0x30e2, "ThinkCentre AIO", ALC233_FIXUP_LENOVO_LINE2_MIC_HOTKEY),
- SND_PCI_QUIRK(0x17aa, 0x310c, "ThinkCentre Station", ALC294_FIXUP_LENOVO_MIC_LOCATION),
---
-2.26.0
-
diff --git a/kernel.spec b/kernel.spec
index 224d0cabc..a2224af2a 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -92,7 +92,7 @@ Summary: The Linux kernel
%if 0%{?released_kernel}
# Do we have a -stable update to apply?
-%define stable_update 4
+%define stable_update 5
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -901,9 +901,6 @@ Patch509: drm-i915-backports.patch
# https://patchwork.ozlabs.org/patch/1260523/
Patch511: e1000e-bump-up-timeout-to-wait-when-ME-un-configure-ULP-mode.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1820196
-Patch512: 0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch
-
# nouveau runpm and secboot fixes
# Accepted nouveau upstream https://github.com/skeggsb/nouveau/commit/f5755e7069d4acbcce1a93692421f358241ead7b
Patch513: 0001-drm-nouveau-workaround-runpm-fail-by-disabling-PCI-p.patch
@@ -3006,6 +3003,9 @@ fi
#
#
%changelog
+* Fri Apr 17 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.6.5-300
+- Linux v5.6.5
+
* Thu Apr 16 2020 Justin M. Forbes <jforbes@fedoraproject.org>
- Nouveau Add missing MODULE_FIRMWARE() lines for initramfs generators (rhbz 1825046)
diff --git a/sources b/sources
index e2407159c..f77958e48 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
SHA512 (linux-5.6.tar.xz) = 80846fe2b4e4a7ff471d2dde28a8216ae807a3209f959e93d39ea4fc9a189ea28ec3db9d303b3fe15a28c2cb90e7446876678e93e23353c2d6f262e364a06bc9
-SHA512 (patch-5.6.4.xz) = 05607a47ee72af4a7b4d8424a3995d92d0cf358902459993908df0e95643cbfa9eec7ed56779d254b7b75ec1c8dbec5eea5e2e845f40f5511533d53b90b1c02e
+SHA512 (patch-5.6.5.xz) = 07b86b6291c6ca99a41c4d507911a9c123839fd3f2ea1770fc3e249913876198f96692dff2453f8c0a89355a238cf9ef9bbc00270c1b87778dd1750ff9184b59