From 8d277b44f126228b5e332787fe69f09569fa6167 Mon Sep 17 00:00:00 2001
From: Timo Aaltonen <timo.aaltonen@canonical.com>
Date: Wed, 7 Apr 2021 18:07:56 +0300
Subject: [PATCH] UBUNTU: Ubuntu-oem-5.10-5.10.0-1021.22

Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
---
 debian.oem/changelog | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/debian.oem/changelog b/debian.oem/changelog
index 0576e93af65a3..a2f7c9f244855 100644
--- a/debian.oem/changelog
+++ b/debian.oem/changelog
@@ -1,10 +1,16 @@
-linux-oem-5.10 (5.10.0-1021.22) UNRELEASED; urgency=medium
+linux-oem-5.10 (5.10.0-1021.22) focal; 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.
+  * focal/linux-oem-5.10: 5.10.0-1021.22 -proposed tracker (LP: #1922921)
 
- -- Timo Aaltonen <timo.aaltonen@canonical.com>  Wed, 07 Apr 2021 17:07:16 +0300
+  * Display abnormal on the TGL+4k panel machines (LP: #1922885)
+    - drm/i915/display: Do not allow DC3CO if PSR SF is enabled
+    - SAUCE: drm/i915/display/psr: Disable DC3CO when the PSR2 is used
+
+  * Fix mic on P620 after S3 resume (LP: #1921757)
+    - ALSA: usb-audio: Carve out connector value checking into a helper
+    - ALSA: usb-audio: Check connector value on resume
+
+ -- Timo Aaltonen <timo.aaltonen@canonical.com>  Wed, 07 Apr 2021 18:07:55 +0300
 
 linux-oem-5.10 (5.10.0-1020.21) focal; urgency=medium