From 1d77789461e847fc143d97b2c5427105300dcb29 Mon Sep 17 00:00:00 2001
From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
Date: Mon, 23 Nov 2020 15:03:08 -0300
Subject: [PATCH] UBUNTU: Ubuntu-5.8.0-31.33

Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
---
 debian.master/changelog | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/debian.master/changelog b/debian.master/changelog
index 9912c7cdcb972..e374e6371be93 100644
--- a/debian.master/changelog
+++ b/debian.master/changelog
@@ -1,10 +1,18 @@
-linux (5.8.0-31.33) UNRELEASED; urgency=medium
+linux (5.8.0-31.33) groovy; urgency=medium
 
-  CHANGELOG: Do not edit directly. Autogenerated at release.
-  CHANGELOG: Use the printchanges target to see the curent changes.
-  CHANGELOG: Use the insertchanges target to create the final log.
+  * groovy/linux: 5.8.0-31.33 -proposed tracker (LP: #1905299)
 
- -- Thadeu Lima de Souza Cascardo <cascardo@canonical.com>  Mon, 23 Nov 2020 13:29:59 -0300
+  * Groovy 5.8 kernel hangs on boot on CPUs with eLLC (LP: #1903397)
+    - drm/i915: Mark ininitial fb obj as WT on eLLC machines to avoid rcu lockup
+      during fbdev init
+
+  * CVE-2020-4788
+    - selftests/powerpc: rfi_flush: disable entry flush if present
+    - powerpc/64s: flush L1D on kernel entry
+    - powerpc/64s: flush L1D after user accesses
+    - selftests/powerpc: entry flush test
+
+ -- Thadeu Lima de Souza Cascardo <cascardo@canonical.com>  Mon, 23 Nov 2020 15:03:08 -0300
 
 linux (5.8.0-30.32) groovy; urgency=medium