Linux v5.5.18

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 743dc6423..f21347660 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -89,7 +89,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 17
+%define stable_update 18
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -868,9 +868,6 @@ Patch510: 0001-fs-Add-VirtualBox-guest-shared-folder-vboxsf-support.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
-
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -2900,6 +2897,9 @@ fi
 #
 #
 %changelog
+* Fri Apr 17 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.18-200
+- Linux v5.5.18
+
 * Mon Apr 13 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.17-200
 - Linux v5.5.17
 
diff --git a/sources b/sources
index 179ced1d5..cf9aa631c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86
-SHA512 (patch-5.5.17.xz) = e5e6086f2faba9d3daa571cddd0550cad723773ec65a4b0675531e6c6235bb4ff6120b904d83a8db63bcf0a9a3e0637a2fa4a8c1ab8c69f83efb3a5308002740
+SHA512 (patch-5.5.18.xz) = 2cba5fcc831f834e7f469de12a99fd25290caab563db23eabe4f7912e2889e097e61400a3fb24c77ec34c3b4187a4dd397ad6b40734c8209c1a928d749585977