From 6f91a34ab69ae200bd4d4b7d483fd630e22f06ea Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Thu, 12 May 2022 14:13:14 +0200
Subject: [PATCH] SPDK 22.01.1

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Iaa0c8f3fe56f4922ece49089ebff412ec2e9bb00
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/12656
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Konrad Sztyber <konrad.sztyber@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
---
 CHANGELOG.md           | 53 +++++++++++++++++++++++++++++++++++++++++-
 include/spdk/version.h |  2 +-
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8dcd8a2b..668a44ed5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,57 @@
 # Changelog
 
-## v22.01.1: (Upcoming Release)
+## v22.01.1
+
+### dpdk
+
+DPDK submodule is now updated to DPDK 21.11.1. This includes fixes for DPDK vhost:
+CVE-2021-3839
+CVE-2022-0669
+Users are strongly encouraged to upgrade.
+
+(#2374) Added `rte_dmadev` as vhost library dependency.
+
+### bdev_crypto
+
+(#2500) Fixed bdev_io double completion.
+
+### bdev_nvme
+
+(#2440) Fixed NULL pointer access by DTRACE when creating qpair.
+
+(#2335) Set `ana_state_updating` only after starting read ANA log page.
+
+### blobstore
+
+(#2347) Avoid recursion when split IO immediately complete.
+
+### iscsi
+
+(#2393) Fix a memory leak in `create_iscsi_sess()` error handling.
+
+### nvme
+
+(#2371) Allocate extra request for fabrics connect.
+
+(#2465) Increase min admin queue size to 256
+
+### nvmf
+
+(#2335) `ctrlr_get_ana_state()` now always returns optimized if ana_reporting is disabled.
+
+(#2395) Avoid a null dereference before null check in FC transport when freeing a request.
+
+(#2471) Delay NVMe-oF TCP qpair destruction till after the socket write callback.
+
+### thread
+
+(#2378) Fix double unlock in `spdk_io_device_register()`.
+
+### vmd
+
+(#2413) Reset root port config before enumeration.
+
+(#2451) Use `config_bus_number` when resetting root ports
 
 ## v22.01: NVMe multipath, NVMe TCP zero-copy, NVMe-oF discovery service
 
diff --git a/include/spdk/version.h b/include/spdk/version.h
index 59161dacc..422a51520 100644
--- a/include/spdk/version.h
+++ b/include/spdk/version.h
@@ -59,7 +59,7 @@
 /**
  * Version string suffix.
  */
-#define SPDK_VERSION_SUFFIX	"-pre"
+#define SPDK_VERSION_SUFFIX	""
 
 /**
  * Single numeric value representing a version number for compile-time comparisons.