summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-03-26 06:21:02 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-03-26 06:21:02 +0100
commit4c78a7ffc7d51e796bc0783dffa79edaabd715b2 (patch)
treebbb587ca0ba709c38d5bb546d6fb3b463e46e76a /kernel.spec
parent812ca0b8a50f3f27ba5a9193563121142b33d59c (diff)
parent24e8702e2e91e140cfce13e7716b5ef3ca3d3e3e (diff)
downloadkernel-4c78a7ffc7d51e796bc0783dffa79edaabd715b2.tar.gz
kernel-4c78a7ffc7d51e796bc0783dffa79edaabd715b2.tar.xz
kernel-4c78a7ffc7d51e796bc0783dffa79edaabd715b2.zip
Merge remote-tracking branch 'origin/f31' into f31-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec12
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index 814d47942..0f4b644b4 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -885,12 +885,6 @@ Patch508: 20200310_chris_chris_wilson_co_uk.patch
# Backport vboxsf from 5.6, can be dropped when we move to 5.6
Patch510: 0001-fs-Add-VirtualBox-guest-shared-folder-vboxsf-support.patch
-# Fix UCSI oopses, (rhbz 1785972) (in gkh's usb-linus, heading towards mainline)
-Patch514: ucsi-oops-fixes.patch
-
-# CVE-2019-19769 rhbz 1786174 1786175
-Patch515: 0001-locks-fix-a-potential-use-after-free-problem-when-wa.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -2923,6 +2917,12 @@ fi
#
#
%changelog
+* Wed Mar 25 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.13-200
+- Linux v5.5.13
+
+* Wed Mar 25 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.12-200
+- Linux v5.5.12
+
* Mon Mar 23 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.11-200
- Linux v5.5.11