diff --git a/.mailmap b/.mailmap
index e3fab1df9d..29b4890532 100644
--- a/.mailmap
+++ b/.mailmap
@@ -312,6 +312,7 @@ YONETANI Tomokazu <y0n3t4n1@gmail.com> <qhwt+git@les.ath.cx>
 YONETANI Tomokazu <y0n3t4n1@gmail.com> <y0netan1@dragonflybsd.org>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 Yi-Jyun Pan <pan93412@gmail.com>
+Yoichi NAKAYAMA <yoichi.nakayama@gmail.com>
 # the two anonymous contributors are different persons:
 anonymous <linux@horizon.com>
 anonymous <linux@horizon.net>
diff --git a/Documentation/RelNotes/2.56.0.adoc b/Documentation/RelNotes/2.56.0.adoc
index 83d2f90daa..7056e990fa 100644
--- a/Documentation/RelNotes/2.56.0.adoc
+++ b/Documentation/RelNotes/2.56.0.adoc
@@ -906,6 +906,10 @@ Fixes since v2.55
    repo_logmsg_reencode() during the rewording operation in 'git
    history' has been plugged.
 
+ * The pathspec matching logic has been updated to avoid out-of-bounds
+   memory accesses when a negative pathspec is shorter than the common
+   prefix of positive pathspecs.
+
  * Other code cleanup, docfix, build fix, etc.
    (merge 026636128f ss/submittingpatches-typofix later to maint).
    (merge d2af22cc21 jc/rerere-doc-typofix later to maint).