summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-02-06 16:42:04 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-02-06 16:42:04 +0100
commit48d2ea1892fb00405dd817b212cff4e821f6b881 (patch)
treeb6de66d7c93c313dccf057f2ac9cb02f06be829e /kernel.spec
parent2a99138f8ae6d1678562ce5fe45c3e2c3c7c5bef (diff)
parent830026294181c96c65634a2bd314bcd34f92805f (diff)
downloadkernel-48d2ea1892fb00405dd817b212cff4e821f6b881.tar.gz
kernel-48d2ea1892fb00405dd817b212cff4e821f6b881.tar.xz
kernel-48d2ea1892fb00405dd817b212cff4e821f6b881.zip
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 6a77b0b39..dad0bfa55 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -837,9 +837,6 @@ Patch600: alsa-5.5.patch
# ALSA code from v5.6 (Intel ASoC Sound Open Firmware driver support)
Patch601: alsa-5.6.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1772498#c101
-Patch602: ASoC-topology-fix-soc_tplg_fe_link_create-link-dobj-.patch
-
# This is already in 5.5 rhbz 1794369
Patch603: 0001-e1000e-Add-support-for-Comet-Lake.patch
@@ -2543,6 +2540,9 @@ fi
#
#
%changelog
+* Thu Feb 06 2020 Jeremy Cline <jcline@redhat.com> - 5.4.18-200
+- Linux v5.4.18
+
* Sat Feb 01 2020 Jeremy Cline <jcline@redhat.com> - 5.4.17-200
- Linux v5.4.17