From aca6704cfa27434452580369b4bc8a024bd0edee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20H=C3=B6ppner?= <hoeppner@linux.ibm.com>
Date: Thu, 11 Dec 2025 17:03:28 +0100
Subject: [PATCH] New release s390-tools-2.40.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   |  9 +++++++--
 CHANGELOG.md | 31 +++++++++++++++++++++++++++++--
 common.mak   |  2 +-
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 31017b90..0b512aa8 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,11 +1,13 @@
 List of all individuals having contributed content to s390-tools
 ----------------------------------------------------------------
 
+- Ajaykumar Rajappa
 - Alexander Egorenkov
 - Alexandra Winter
 - Alexey Ishchuk
 - Andreas Herrmann
 - André Wild
+- Annu Sharma
 - Antoinette Kaschner
 - Arnd Bergmann
 - Axel Wirbser
@@ -28,6 +30,7 @@ List of all individuals having contributed content to s390-tools
 - Eberhard Pasch
 - Eduard Shishkin
 - Einar Lueck
+- Ellen McIntyre
 - Eric Farman
 - Eric Sandeen
 - Erwin Vicari
@@ -49,8 +52,8 @@ List of all individuals having contributed content to s390-tools
 - Graham Inggs
 - Guevenc Guelce
 - Hannes Reinecke
-- Hans-Joachim Picht
 - Hans Wippel
+- Hans-Joachim Picht
 - Harald Freudenberger
 - Heiko Carstens
 - Hendrik Brueckner
@@ -72,12 +75,13 @@ List of all individuals having contributed content to s390-tools
 - Jens Remus
 - Jochen Roehrig
 - Joern Siglen
-- Jörn Siglen
 - Juergen Christ
 - Julian Wiedmann
+- Jörn Siglen
 - Karsten Graul
 - Kittipon Meesompop
 - Klaus-Dieter Wacker
+- L. E. Segovia
 - Lakhvich Dmitriy
 - Marc Hartmayer
 - Mario Held
@@ -133,6 +137,7 @@ List of all individuals having contributed content to s390-tools
 - Sven Schnelle
 - Sven Schuetz
 - Swen Schillig
+- Szabina Korbai
 - Taraka R. Bodireddy
 - Thomas Heidrich
 - Thomas Huth
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 114ca8f4..0aa23898 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,42 @@
 Release history for s390-tools (MIT version)
 --------------------------------------------
 
-* __v2.xx.x (20xx-xx-xx)__
+* __v2.40.0 (2025-12-11)__
 
-  For Linux kernel version: 6.x
+  For Linux kernel version: 6.18
 
   Add new tools / libraries:
+  - Add project-wide .clang-tidy configuration
+  - libutil: Introduce util_time for time related functionality
+  - libutil: Introduce zsh/bash autocompletion tooling based on util_opt
+  - pvinfo: Tool to display Secure Execution system information
+  - pvverify: Tool to verify host-key documents
 
   Changes of existing tools:
+  - cpumf: Implement zsh and bash autocompletion
+  - dasdfmt: Implement zsh and bash autocompletion
+  - dbginfo.sh: Add NetworkManager and netplan
+  - dbginfo.sh: Add kvm_stat
+  - dbginfo.sh: Adding stp time information
+  - dbginfo.sh: Simplify procfs collection
+  - hyptop: Add physical information row
+  - hyptop: Calculate sample time delta for physical partition
+  - hyptop: Replace long option names using _ with - for consistency
+            For example: --cpu_types -> --cpu-types
+            (Options with _ are still supported for backward compatibility)
+  - libekmfweb: Add function to validate a certificate against the identity key
+  - netboot: Add longer kernel command lines support
+  - udev/rules.d: Make virtio-blk devices non-rotational
+  - udev/rules.d: Set default io scheduler to 'none' for virtio-blk
+  - ziomon: Add support to sample device symlinks (/dev/disk/...)
+  - ziorep_config: Add fcp-lun details to -M option output
+  - ziorep_config: Add port_id and failed attributes to -A option output
+  - netboot: Install on non-s390 architectures
 
   Bug Fixes:
+  - lib(ekmfweb|kmipclient): Use ln without -r
+  - s390-tools: Fix various compilation issues with musl libc
+  - zipl/boot: Fix unused loadparm when SCLP line-mode console is absent
 
 * __v2.39.0 (2025-10-14)__
 
diff --git a/common.mak b/common.mak
index 8f1d04af..39f944bb 100644
--- a/common.mak
+++ b/common.mak
@@ -32,7 +32,7 @@ endif
 # The variable "DISTRELEASE" should be overwritten in rpm spec files with:
 # "make DISTRELEASE=%{release}" and "make install DISTRELEASE=%{release}"
 VERSION            := 2
-RELEASE            := 39
+RELEASE            := 40
 PATCHLEVEL         := 0
 DISTRELEASE        := build-$(shell date +%Y%m%d)
 S390_TOOLS_RELEASE := $(VERSION).$(RELEASE).$(PATCHLEVEL)-$(DISTRELEASE)