From 00ef6ee3ffa44e505c1199574d6fe4bfb831d6ae Mon Sep 17 00:00:00 2001
From: "Ralf W. Grosse-Kunstleve" <rwgkio@gmail.com>
Date: Fri, 13 Sep 2024 15:03:10 -0700
Subject: [PATCH] Manually copy 2.12.1 Changelog addition from master

---
 docs/changelog.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d2285f237..c0b2b1683 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -15,6 +15,19 @@ IN DEVELOPMENT
 
 Changes will be summarized here periodically.
 
+Version 2.12.1 (September 13, 2024)
+-----------------------------------
+
+New Features:
+
+* A new ``self._pybind11_conduit_v1_()`` method is automatically added to all
+  ``py::class_``-wrapped types, to enable type-safe interoperability between
+  different independent Python/C++ bindings systems, including pybind11
+  versions with different ``PYBIND11_INTERNALS_VERSION``'s. Supported on
+  pybind11 2.11.2, 2.12.1, and 2.13.6+.
+  `#5296 <https://github.com/pybind/pybind11/pull/5296>`_
+
+
 Version 2.12.0 (March 27, 2025)
 -------------------------------