From 723903da3cb4cac844dbfe1d7865080c868a4ad7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 8 Jul 2025 16:14:50 +0200
Subject: [PATCH 1/3] Bump version

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 6a6900382..bafceb320 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-2.30.0
+2.31.0

From 4fa99d743ea365681011c56f1901f6d0c2ce83ab Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 8 Jul 2025 16:15:45 +0200
Subject: [PATCH 2/3] release-process.md: Remove unnecessary step

---
 maintainers/release-process.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/maintainers/release-process.md b/maintainers/release-process.md
index f2c61302b..37b38fb9f 100644
--- a/maintainers/release-process.md
+++ b/maintainers/release-process.md
@@ -39,10 +39,6 @@ release:
 * Proof-read / edit / rearrange the release notes if needed. Breaking changes
   and highlights should go to the top.
 
-* Run `maintainers/release-credits` to make sure the credits script works
-  and produces a sensible output. Some emails might not automatically map to
-  a GitHub handle.
-
 * Push.
 
   ```console

From 06665e27f48ca04ac877b2b09749fbdc3de0a7eb Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 8 Jul 2025 16:18:53 +0200
Subject: [PATCH 3/3] Update .mergify.yml

---
 .mergify.yml | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/.mergify.yml b/.mergify.yml
index 8941711a9..f49144113 100644
--- a/.mergify.yml
+++ b/.mergify.yml
@@ -150,3 +150,14 @@ pull_request_rules:
         labels:
           - automatic backport
           - merge-queue
+
+  - name: backport patches to 2.30
+    conditions:
+      - label=backport 2.30-maintenance
+    actions:
+      backport:
+        branches:
+          - "2.30-maintenance"
+        labels:
+          - automatic backport
+          - merge-queue