From 1e60637f9d8f3505208282416abfbb87fabc4795 Mon Sep 17 00:00:00 2001
From: Marius Poke <marius.poke@posteo.de>
Date: Fri, 20 Sep 2024 18:21:53 +0200
Subject: [PATCH] docs: prepare v6.1.0 (#2303)

* update changelog

* update release notes
---
 .../bug-fixes/2282-duplicate-events.md           |  0
 .../bug-fixes/2288-rewards-stride.md             |  0
 .../state-breaking/2288-rewards-stride.md        |  0
 .changelog/v6.1.0/summary.md                     |  1 +
 CHANGELOG.md                                     | 16 ++++++++++++++++
 RELEASE_NOTES.md                                 | 16 ++++------------
 UPGRADING.md                                     |  4 +++-
 7 files changed, 24 insertions(+), 13 deletions(-)
 rename .changelog/{unreleased => v6.1.0}/bug-fixes/2282-duplicate-events.md (100%)
 rename .changelog/{unreleased => v6.1.0}/bug-fixes/2288-rewards-stride.md (100%)
 rename .changelog/{unreleased => v6.1.0}/state-breaking/2288-rewards-stride.md (100%)
 create mode 100644 .changelog/v6.1.0/summary.md

diff --git a/.changelog/unreleased/bug-fixes/2282-duplicate-events.md b/.changelog/v6.1.0/bug-fixes/2282-duplicate-events.md
similarity index 100%
rename from .changelog/unreleased/bug-fixes/2282-duplicate-events.md
rename to .changelog/v6.1.0/bug-fixes/2282-duplicate-events.md
diff --git a/.changelog/unreleased/bug-fixes/2288-rewards-stride.md b/.changelog/v6.1.0/bug-fixes/2288-rewards-stride.md
similarity index 100%
rename from .changelog/unreleased/bug-fixes/2288-rewards-stride.md
rename to .changelog/v6.1.0/bug-fixes/2288-rewards-stride.md
diff --git a/.changelog/unreleased/state-breaking/2288-rewards-stride.md b/.changelog/v6.1.0/state-breaking/2288-rewards-stride.md
similarity index 100%
rename from .changelog/unreleased/state-breaking/2288-rewards-stride.md
rename to .changelog/v6.1.0/state-breaking/2288-rewards-stride.md
diff --git a/.changelog/v6.1.0/summary.md b/.changelog/v6.1.0/summary.md
new file mode 100644
index 0000000000..7531841dbf
--- /dev/null
+++ b/.changelog/v6.1.0/summary.md
@@ -0,0 +1 @@
+*September 20, 2024*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fefa0bb9a7..32d705e736 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## v6.1.0
+
+*September 20, 2024*
+
+### BUG FIXES
+
+- Remove duplicate event emission on cached context.
+  ([\#2282](https://github.com/cosmos/interchain-security/pull/2282))
+- `[x/provider]` Add patch to enable ICS rewards from Stride to be distributed.
+  ([\#2288](https://github.com/cosmos/interchain-security/pull/2288))
+
+### STATE BREAKING
+
+- `[x/provider]` Add patch to enable ICS rewards from Stride to be distributed.
+  ([\#2288](https://github.com/cosmos/interchain-security/pull/2288))
+
 ## v6.0.0
 
 *September 12, 2024*
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 2c87a49eb3..aad3ad3496 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,20 +1,12 @@
-<!--
-  A release notes template that should be adapted for every release
-    - release: v6.0.0
-    - release branch: v6.0.x
-    - the last release: v5.2.0
-    - the last release branch: v5.2.x
--->
+# Interchain Security v6.1.0  Release Notes
 
-# Interchain Security v6.0.0  Release Notes
-
-❗ ***Note this release is ONLY relevant to providers***
+⚠️ ***This release in the v6 release series should be used instead of the deprecated [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0) release.***
 
 ## 📝 Changelog
 
-Check out the [changelog](https://github.com/cosmos/interchain-security/blob/v6.0.0/CHANGELOG.md) for a list of relevant changes or [compare all changes](https://github.com/cosmos/interchain-security/compare/<v-last>...v6.0.0) from last release.
+Check out the [changelog](https://github.com/cosmos/interchain-security/blob/v6.1.0/CHANGELOG.md) for a list of relevant changes or [compare all changes](https://github.com/cosmos/interchain-security/compare/v5.2.0...v6.1.0) from last release.
 
-Refer to the [upgrading guide](https://github.com/cosmos/interchain-security/blob/release/v6.0.x/UPGRADING.md) when migrating from `v5.2.x` to `v6.0.x`.
+Refer to the [upgrading guide](https://github.com/cosmos/interchain-security/blob/release/v6.1.x/UPGRADING.md) when migrating from `v5.2.x` to `v6.1.x`.
 
 ## 🚀 Highlights
 
diff --git a/UPGRADING.md b/UPGRADING.md
index 2171f1175d..0005e218f1 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -1,6 +1,8 @@
 # Upgrading Replicated Security
 
-## v6.0.x
+## v6.1.x
+
+_Note that [v6.0.0](https://github.com/cosmos/interchain-security/releases/tag/v6.0.0) is deprecated and should not be used in production_.
 
 ### Provider