From 0d1d2953bfec64910f7e11b5cc0049e4fdafbb0c Mon Sep 17 00:00:00 2001
From: Derek McGowan <derek@mcg.dev>
Date: Mon, 2 May 2022 16:57:34 -0700
Subject: [PATCH] Prepare release notes for 1.6.4

Signed-off-by: Derek McGowan <derek@mcg.dev>
---
 .mailmap             |  2 ++
 releases/v1.6.4.toml | 21 +++++++++++++++++++++
 version/version.go   |  2 +-
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 releases/v1.6.4.toml

diff --git a/.mailmap b/.mailmap
index 83bb03cd002c..faf769cc1269 100644
--- a/.mailmap
+++ b/.mailmap
@@ -87,6 +87,7 @@ Michael Crosby <crosbymichael@gmail.com> <michael@thepasture.io>
 Michael Katsoulis <michaelkatsoulis88@gmail.com>
 Mike Brown <brownwm@us.ibm.com> <mikebrow@users.noreply.github.com>
 Mohammad Asif Siddiqui <mohammad.asif.siddiqui1@huawei.com>
+Nabeel Rana <nabeelnrana@gmail.com>
 Ng Yang <wssccc@qq.com>
 Ning Li <ning.a.li@transwarp.io>
 ningmingxiao <ning.mingxiao@zte.com.cn>
@@ -121,6 +122,7 @@ Tõnis Tiigi <tonistiigi@gmail.com>
 Wade Lee <weidonglee27@gmail.com>
 Wade Lee <weidonglee27@gmail.com> <weidonglee29@gmail.com>
 Wade Lee <weidonglee27@gmail.com> <21621232@zju.edu.cn>
+Wang Bing <wangbing.adam@gmail.com>
 wanglei <wllenyj@linux.alibaba.com>
 wanglei <wllenyj@linux.alibaba.com> <wanglei01@alibaba-inc.com>
 wangzhan <wang.zhan@smartx.com>
diff --git a/releases/v1.6.4.toml b/releases/v1.6.4.toml
new file mode 100644
index 000000000000..dc38bf7db30c
--- /dev/null
+++ b/releases/v1.6.4.toml
@@ -0,0 +1,21 @@
+# commit to be tagged for new release
+commit = "HEAD"
+
+project_name = "containerd"
+github_repo = "containerd/containerd"
+match_deps = "^github.com/(containerd/[a-zA-Z0-9-]+)$"
+
+# previous release
+previous = "v1.6.3"
+
+pre_release = false
+
+preface = """\
+The fourth patch release for containerd 1.6 includes two fixes for CNI and SELinux.
+
+### Notable Updates
+
+* **Update go-cni to fix teardown regression** ([#6877](https://github.com/containerd/containerd/pull/6877))
+* **Fix broken SELinux relabeling for Kubernetes volume mounts** ([#6878](https://github.com/containerd/containerd/pull/6878))
+
+See the changelog for complete list of changes"""
diff --git a/version/version.go b/version/version.go
index 806e3e0d73e5..b5e00c5d820d 100644
--- a/version/version.go
+++ b/version/version.go
@@ -23,7 +23,7 @@ var (
 	Package = "github.com/containerd/containerd"
 
 	// Version holds the complete version number. Filled in at linking time.
-	Version = "1.6.3+unknown"
+	Version = "1.6.4+unknown"
 
 	// Revision is filled with the VCS (e.g. git) revision being used to build
 	// the program at linking time.