From 1f0dd58a43b5bc8118b123eca1b07781b052293d Mon Sep 17 00:00:00 2001
From: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Date: Wed, 3 Mar 2021 12:23:38 -0500
Subject: [PATCH] SPDK 21.01.1

Signed-off-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Ic086efcf2be78403e905c9b9f4d8d9882a85c4d0
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6683
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
---
 CHANGELOG.md           | 31 ++++++++++++++++++++++++++++++-
 include/spdk/version.h |  2 +-
 pkg/spdk.spec          |  4 ++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8941d7e60..0c25e7f79 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,35 @@
 # Changelog
 
-## v21.01.1: (Upcoming Release)
+## v21.01.1:
+
+### dpdk
+
+Added `rte_ethdev` and `rte_net` dependencies for all builds with DPDK.
+
+Fixed compatibility issues with DPDK 19.11.
+
+### iscsi
+
+A security vulnerability has been identified and fixed in the SPDK iSCSI target.
+A TEXT PDU with no data, but CONTINUE flag set, would result in a NULL pointer dereference
+and crash the SPDK iSCSI target process. All users of the SPDK iSCSI target
+are recommended to update. All SPDK versions <= v21.01 are affected.
+
+### nbd
+
+Fixed kernel hang when bdev is removed by always setting NBD_SET_TIMEOUT.
+
+### nvme
+
+Fixed segfault when removing qpair when transport connection fails (issue #1777).
+
+### ocssd
+
+Fixed the bug that no media event is pushed to the target bdev.
+
+### sock
+
+Added `enable_quickack` and `enable_placement_id` when saving JSON configuration.
 
 ## v21.01: Dynamic scheduler, vfio-user, ZNS Zone Append
 
diff --git a/include/spdk/version.h b/include/spdk/version.h
index 4d601bd1b..1de5af4a4 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.
diff --git a/pkg/spdk.spec b/pkg/spdk.spec
index 407a6876c..1a204a43f 100644
--- a/pkg/spdk.spec
+++ b/pkg/spdk.spec
@@ -2,12 +2,12 @@
 %bcond_with doc
 
 Name: spdk
-Version: 21.01.x
+Version: 21.01.1
 Release: 0%{?dist}
 Epoch: 0
 URL: http://spdk.io
 
-Source: https://github.com/spdk/spdk/archive/v21.01.x.tar.gz
+Source: https://github.com/spdk/spdk/archive/v21.01.1.tar.gz
 Summary: Set of libraries and utilities for high performance user-mode storage
 
 %define package_version %{epoch}:%{version}-%{release}