From 44598496c525c103b8c26005ee356c7360d3d7b4 Mon Sep 17 00:00:00 2001
From: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Date: Thu, 7 Dec 2017 14:21:36 +0100
Subject: [PATCH] New release s390-tools-2.2.0

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
---
 AUTHORS.md   | 10 ++++++++--
 CHANGELOG.md | 15 +++++++++++++--
 common.mak   |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index e17d8a7a..3fb0731b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -2,17 +2,19 @@ List of all individuals having contributed content to s390-tools
 ----------------------------------------------------------------
 
 - Alexey Ishchuk
-- Andre Wild
 - Andreas Herrmann
+- Andre Wild
 - Antoinette Kaschner
 - Arnd Bergmann
 - Axel Wirbser
 - Benjamin Block
 - Carsten Otte
 - Christian Borntraeger
+- Christian Ehrhardt
 - Christof Schmitt
 - Claudio Imbrenda
 - Clemens von Mann
+- Dan Horak
 - Despina Papadopoulou
 - Eberhard Pasch
 - Einar Lueck
@@ -20,6 +22,7 @@ List of all individuals having contributed content to s390-tools
 - Eugene Crosser
 - Eugene Dvurechenski
 - Farhan Ali
+- Fedor Loshakov
 - Felix Beck
 - Frank Blaschka
 - Frank Munzert
@@ -27,8 +30,9 @@ List of all individuals having contributed content to s390-tools
 - Fritz Elfert
 - Gerald Schaefer
 - Gerhard Tonn
-- Hans Wippel
+- Hannes Reinecke
 - Hans-Joachim Picht
+- Hans Wippel
 - Harald Freudenberger
 - Heiko Carstens
 - Hendrik Brueckner
@@ -64,6 +68,8 @@ List of all individuals having contributed content to s390-tools
 - Peter Oberparleiter
 - Peter Tiedemann
 - Philipp Kern
+- Philipp Rudo
+- Rafael Fonseca
 - Raimund Schroeder
 - Ralph Wuerthner
 - Rene Trumpp
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b7716f3..c0ec2bf9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,21 +1,32 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
 
-* __v2.1.1 (2017-mm-dd)__
+* __v2.2.0 (2017-12-07)__
+
+  For Linux kernel version: 4.14
 
   Removed tools:
   - lsmem/chmem: Moved to util-linux >= 2.30
 
   Changes of existing tools:
-  - lszcrypt: Add CEX6S exploitation
+  - lszcrypt: Add CEX6S support
+  - cpuplugd/mon_tools: Improve systemctl start error handling
+  - systemd: Install also the unit configuration files
 
   Bug Fixes:
+  - build process: Fix parallel build for libutil
+  - cpi: Add missing Install section to service unit
   - lsluns: Do not scan (all) if filters match nothing
   - lsluns: Enhance usage statement and man page
+  - zdev: Use correct path to vmcp binary
   - ziomon: Re-add missing line in ziomon_fcpconf
+  - ziomon: Fix non-zero return code in ziomon_util
+  - zipl: Remove invalid dasdview command line option
 
 * __v2.1.0 (2017-09-25)__
 
+  For Linux kernel version: 4.13
+
   Added new tools:
   - netboot: Scripts for building a PXE-style netboot image for KVM
   - 90-cpi.rules/cpictl: New udev rule to update CPI when KVM is used
diff --git a/common.mak b/common.mak
index e3328ab6..67cdf692 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            = 1
+RELEASE            = 2
 PATCHLEVEL         = 0
 DISTRELEASE        = build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE = $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)