Merge remote-tracking branch 'dev/15-9-stable' into 15-9-stable15-9-stable

3 files changed, 9 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f702487c4..54d252583 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Gitaly changelog
 
+## 15.9.8 (2023-05-10)
+
+### Security (1 change)
+
+- [Makefile: Upgrade Git to security release v2.40.1.gl2 and v2.39.3.gl1](gitlab-org/security/gitaly@99201bff6161425f7c43e78ba708b76b300b4ae3) ([merge request](gitlab-org/security/gitaly!86))
+
 ## 15.9.7 (2023-05-03)
 
 No changes.
diff --git a/Makefile b/Makefile
index 88c8e1d1f..6c93281a8 100644
--- a/Makefile
+++ b/Makefile
@@ -133,9 +133,9 @@ GIT_EXECUTABLES += git-http-backend
 ## tags, branches, and commit ids.
 GIT_VERSION ?=
 ## The Git version used for bundled Git v2.38.
-GIT_VERSION_2_38 ?= v2.38.4.gl1
+GIT_VERSION_2_38 ?= v2.38.5.gl1
 ## The Git version used for bundled Git v2.39.
-GIT_VERSION_2_39 ?= v2.39.2
+GIT_VERSION_2_39 ?= v2.39.3.gl1
 
 ## Skip overriding the Git version and instead use the Git version as specified
 ## in the Git sources. This is required when building Git from a version that
diff --git a/VERSION b/VERSION
index 916b312da..63e48abe4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-15.9.7
\ No newline at end of file
+15.9.8
\ No newline at end of file