diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-17 18:16:38 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-17 18:16:38 +0200 |
| commit | bce05299c4d0c5a5269af90780dd65af51183a55 (patch) | |
| tree | 8956a23a1467bf32f41a0caf533db5ccf43a7626 | |
| parent | 02e8464581774c4149a9a86007e7baff94f3f5f8 (diff) | |
| parent | 46596990b38e587bc797bef7a775040c41c430d5 (diff) | |
| download | kernel-bce05299c4d0c5a5269af90780dd65af51183a55.tar.gz kernel-bce05299c4d0c5a5269af90780dd65af51183a55.tar.xz kernel-bce05299c4d0c5a5269af90780dd65af51183a55.zip | |
Merge remote-tracking branch 'origin/f32' into f32-user-thl-vanilla-fedora
| -rw-r--r-- | 0001-ALSA-hda-realtek-Add-quirk-for-Lenovo-Carbon-X1-8th-.patch | 34 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 3 insertions, 37 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 fe89dc30d..87ff720e5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -920,9 +920,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 @@ -3028,6 +3025,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) |