From f6557acf6080bc1354c50b843f0a635c6de40f28 Mon Sep 17 00:00:00 2001
From: Rob Bradford <robert.bradford@intel.com>
Date: Thu, 10 Mar 2022 17:34:59 +0000
Subject: [PATCH] build: Release v22.1 (bug fix release)

Signed-off-by: Rob Bradford <robert.bradford@intel.com>
---
 Cargo.lock                |  2 +-
 Cargo.toml                |  2 +-
 release-notes.md          | 16 ++++++++++++----
 rpm/cloud-hypervisor.spec |  5 ++++-
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f99b516a2..0cb8f12f0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -148,7 +148,7 @@ dependencies = [
 
 [[package]]
 name = "cloud-hypervisor"
-version = "22.0.0"
+version = "22.1.0"
 dependencies = [
  "anyhow",
  "api_client",
diff --git a/Cargo.toml b/Cargo.toml
index cf49538f2..65648c7bf 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cloud-hypervisor"
-version = "22.0.0"
+version = "22.1.0"
 authors = ["The Cloud Hypervisor Authors"]
 edition = "2018"
 default-run = "cloud-hypervisor"
diff --git a/release-notes.md b/release-notes.md
index 55c550bff..c4e59b992 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,4 @@
+- [v22.1](#v221)
 - [v22.0](#v220)
     - [GDB Debug Stub Support](#gdb-debug-stub-support)
     - [`virtio-iommu` Backed Segments](#virtio-iommu-backed-segments)
@@ -5,7 +6,7 @@
     - [`virtio-balloon` Free Page Reporting](#virtio-balloon-free-page-reporting)
     - [Support for Direct Kernel Booting with TDX](#support-for-direct-kernel-booting-with-tdx)
     - [PMU Support for AArch64](#pmu-support-for-aarch64)
-    - [Documentation Under CC-BY-4.0 Licese](#documentation-under-cc-by-40-licese)
+    - [Documentation Under CC-BY-4.0 License](#documentation-under-cc-by-40-license)
     - [Deprecation of "Classic" `virtiofsd`](#deprecation-of-classic-virtiofsd)
     - [Notable Bug Fixes](#notable-bug-fixes)
     - [Contributors](#contributors)
@@ -194,10 +195,17 @@
     - [Unit testing](#unit-testing)
     - [Integration tests parallelization](#integration-tests-parallelization)
 
+# v22.1
+
+This is a bug fix release. The following issues have been addressed:
+
+* VFIO ioctl reordering to fix MSI on AMD platforms (#3827)
+* Fix `virtio-net` control queue (#3829)
+
 # v22.0
 
-This release has been tracked through the [v21.0
-project](https://github.com/cloud-hypervisor/cloud-hypervisor/projects/24).
+This release has been tracked through the [v22.0
+project](https://github.com/cloud-hypervisor/cloud-hypervisor/projects/25).
 
 ### GDB Debug Stub Support
 
@@ -238,7 +246,7 @@ has been updated for this usage.
 A PMU is now available on AArch64 for guest performance profiling. This will be
 exposed automatically if available from the host.
 
-### Documentation Under CC-BY-4.0 Licese
+### Documentation Under CC-BY-4.0 License
 
 The documentation is now licensed under the "Creative Commons Attribution 4.0
 International" license which is aligned with the project charter under the
diff --git a/rpm/cloud-hypervisor.spec b/rpm/cloud-hypervisor.spec
index 56da2c4b8..75da4bf3e 100644
--- a/rpm/cloud-hypervisor.spec
+++ b/rpm/cloud-hypervisor.spec
@@ -9,7 +9,7 @@
 
 Name:           cloud-hypervisor
 Summary:        Cloud Hypervisor is an open source Virtual Machine Monitor (VMM) that runs on top of KVM.
-Version:        22.0
+Version:        22.1
 Release:        0%{?dist}
 License:        ASL 2.0 or BSD-3-clause
 Group:          Applications/System
@@ -112,6 +112,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+*   Thu Mar 10 2022 Rob Bradford <robert.bradford@intel.com> 22.1-0
+-   Update to 22.1
+
 *   Thu Mar 03 2022 Rob Bradford <robert.bradford@intel.com> 22.0-0
 -   Update to 22.0