summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-04-02 07:10:26 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-04-02 07:10:26 +0200
commit450c9488245bc95681bdc3b8490f4889eb249d81 (patch)
treeefd539ee2511a65849555d60fe703e8ebb400941 /kernel.spec
parent128691ea79bee359cc58c1f98905081c85777477 (diff)
parent3263eacd00273eba18e112d19d75627f0929356c (diff)
downloadkernel-450c9488245bc95681bdc3b8490f4889eb249d81.tar.gz
kernel-450c9488245bc95681bdc3b8490f4889eb249d81.tar.xz
kernel-450c9488245bc95681bdc3b8490f4889eb249d81.zip
merge origin
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec11
1 files changed, 9 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index 01b13f9c4..402bcc8b8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -93,10 +93,11 @@ Summary: The Linux kernel
## If this is a released kernel ##
%if 0%{?released_kernel}
+# Is it a -stable RC?
+%define stable_rc 0
+
# Do we have a -stable update to apply?
%define stable_update 1
-# Is it a -stable RC?
-%define stable_rc 0
# Set rpm version accordingly
%if 0%{?stable_update}
%define stablerev %{stable_update}
@@ -859,6 +860,8 @@ Patch324: regulator-pwm-Don-t-warn-on-probe-deferral.patch
Patch325: backlight-lp855x-Ensure-regulators-are-disabled-on-probe-failure.patch
# https://patchwork.ozlabs.org/patch/1261638/
Patch326: arm64-drm-tegra-Fix-SMMU-support-on-Tegra124-and-Tegra210.patch
+# http://patchwork.ozlabs.org/patch/1221384/
+Patch327: PCI-Add-MCFG-quirks-for-Tegra194-host-controllers.patch
# Coral
Patch330: arm64-dts-imx8mq-phanbell-Add-support-for-ethernet.patch
@@ -3006,6 +3009,10 @@ fi
#
#
%changelog
+* Wed Apr 01 2020 Jeremy Cline <jcline@redhat.com> - 5.6.1-300
+- Linux v5.6.1
+- Fixes CVE-2020-8835 (rhbz 1818941 1817350)
+
* Mon Mar 30 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-300
- Linux v5.6