From d8b8114e6fa4f55b1c2fc91e039efc7af5c898e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B6ppner?= <hoeppner@linux.ibm.com>
Date: Wed, 20 Apr 2022 13:20:01 +0200
Subject: [PATCH] New release s390-tools-2.21.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
---
 AUTHORS.md   |  5 +++--
 CHANGELOG.md | 30 ++++++++++++++++++++++--------
 common.mak   |  2 +-
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 5041b2f8..c4d3e55a 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -5,7 +5,7 @@ List of all individuals having contributed content to s390-tools
 - Alexandra Winter
 - Alexey Ishchuk
 - Andreas Herrmann
-- Andre Wild
+- André Wild
 - Antoinette Kaschner
 - Arnd Bergmann
 - Axel Wirbser
@@ -19,6 +19,7 @@ List of all individuals having contributed content to s390-tools
 - Clemens von Mann
 - Colin Walters
 - Dan Horak
+- Dan Horák
 - Despina Papadopoulou
 - Dimitri John Ledkov
 - Eberhard Pasch
@@ -53,7 +54,7 @@ List of all individuals having contributed content to s390-tools
 - Ingo Franzki
 - Ingo Tuchscherer
 - Jan Glauber
-- Jan Hoeppner
+- Jan Höppner
 - Jan Willeke
 - Jason J. Herne
 - Javier Martinez Canillas
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36c18d2e..cd58a544 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +1,37 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
-* __v2.20.x (2022-xx-xx)__
+* __v2.21.0 (2022-04-20)__
 
-  For Linux kernel version: 5.xx
+  For Linux kernel version: 5.17
 
   Add new tools / libraries:
+  - libcpumf: Create library libcpumf for CPU Measurement functions
 
   Changes of existing tools:
-  - dbginfo.sh: rework script formatting (indents, order)
-  - dbginfo.sh: update sysfs collection (excludes, messages)
-  - dbginfo.sh: replace "which" by builtin command "type"
-  - chreipl-fcp-mpath: bundle a pre-cooked version of the manpage for
-      build environments without access to `pandoc`
+  - chreipl-fcp-mpath: bundle a pre-cooked version of the manpage for build
+                       environments without access to `pandoc`
   - dbginfo.sh: Add multipath info to map paths to FC addressing and prio group
-  - dbginfo.sh: Sort list of environment variables for readability
   - dbginfo.sh: Collect config files of systemd-modules-load.service
+  - dbginfo.sh: Sort list of environment variables for readability
+  - dbginfo.sh: Replace "which" by builtin command "type"
+  - dbginfo.sh: Rework script formatting (indents, order)
+  - dbginfo.sh: Update sysfs collection (excludes, messages)
+  - genprotimg: Add Protected Virtualization (PV) dump support
+  - genprotimg: Remove DigiCert root CA pinning
+  - lszcrypt: Add CEX8S support
+  - zcryptctl: Add control domain handling
+  - zcryptstats: Add CEX8 support
+  - zipl: Allow optional entries that are left out when files are missing
+  - zipl: make IPL sections defined with BLS to inherit a target field
+  - zpcictl: Add option to trigger firmware reset
 
   Bug Fixes:
+  - cpictl: Handle excessive kernel version numbers
   - dbginfo.sh: Collect all places where modprobe.d config files could exist
+  - fdasd: Fix endless menu loop on EOF
+  - zdump/dfi: Fix segfault due to double free
+  - zdump: Fix /dev/mem reading
+  - zpcictl: Fix race of SCLP reset and Linux recovery
 
 * __v2.20.0 (2022-02-04)__
 
diff --git a/common.mak b/common.mak
index e2be6449..78c678ec 100644
--- a/common.mak
+++ b/common.mak
@@ -5,7 +5,7 @@ COMMON_INCLUDED = true
 # The variable "DISTRELEASE" should be overwritten in rpm spec files with:
 # "make DISTRELEASE=%{release}" and "make install DISTRELEASE=%{release}"
 VERSION            = 2
-RELEASE            = 20
+RELEASE            = 21
 PATCHLEVEL         = 0
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)