From d530569ac2ac8eaa69dac35ff3248cd8d7b7139a Mon Sep 17 00:00:00 2001
From: Bo Chen <chen.bo@intel.com>
Date: Tue, 18 Apr 2023 11:28:15 -0700
Subject: [PATCH] build: Release v31.1 (bug fix release)

Signed-off-by: Bo Chen <chen.bo@intel.com>
---
 Cargo.lock              |  2 +-
 Cargo.toml              |  2 +-
 release-notes.md        | 11 +++++++++++
 vm-migration/src/lib.rs |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bfc2423d6..5351b6c44 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -179,7 +179,7 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cloud-hypervisor"
-version = "31.0.0"
+version = "31.1.0"
 dependencies = [
  "anyhow",
  "api_client",
diff --git a/Cargo.toml b/Cargo.toml
index cbbdf118a..b5364eb61 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cloud-hypervisor"
-version = "31.0.0"
+version = "31.1.0"
 authors = ["The Cloud Hypervisor Authors"]
 edition = "2021"
 default-run = "cloud-hypervisor"
diff --git a/release-notes.md b/release-notes.md
index cddfcaa02..2d6af773f 100644
--- a/release-notes.md
+++ b/release-notes.md
@@ -1,3 +1,4 @@
+- [v31.1](#v311)
 - [v31.0](#v310)
     - [Update to Latest `acpi_tables`](#update-to-latest-acpi_tables)
     - [Update Reference Kernel to 6.2](#update-reference-kernel-to-62)
@@ -276,6 +277,16 @@
     - [Unit testing](#unit-testing)
     - [Integration tests parallelization](#integration-tests-parallelization)
 
+# v31.1
+
+This is a bug fix release. The following issues have been addressed:
+
+* Ignore and warn TAP FDs sent via the HTTP request body (#5350)
+* Properly preserve and close valid FDs for TAP devices (#5373)
+* Only use `KVM_ARM_VCPU_PMU_V3` if available (#5360)
+* Only touch the tty flags if it's being used (#5343)
+* Fix seccomp filter lists for vhost-user devices (#5361)
+
 # v31.0
 
 This release has been tracked in our [roadmap
diff --git a/vm-migration/src/lib.rs b/vm-migration/src/lib.rs
index 7e181334c..52f603265 100644
--- a/vm-migration/src/lib.rs
+++ b/vm-migration/src/lib.rs
@@ -13,7 +13,7 @@ pub mod protocol;
 
 /// Global VMM version for versioning
 const MAJOR_VERSION: u16 = 31;
-const MINOR_VERSION: u16 = 0;
+const MINOR_VERSION: u16 = 1;
 const VMM_VERSION: u16 = MAJOR_VERSION << 12 | MINOR_VERSION & 0b1111;
 
 pub trait VersionMapped {