From e974bccd0882914c88ab36e1f70b17b3d33c3a32 Mon Sep 17 00:00:00 2001
From: Miguel Company <miguelcompany@eprosima.com>
Date: Thu, 18 Dec 2025 14:38:11 +0100
Subject: [PATCH 1/3] Refs #23085. Add notes from v2.6.11

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
---
 .../previous_versions/supported_versions.rst  |  1 +
 docs/notes/previous_versions/v2.6.11.rst      | 32 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 docs/notes/previous_versions/v2.6.11.rst

diff --git a/docs/notes/previous_versions/supported_versions.rst b/docs/notes/previous_versions/supported_versions.rst
index 96082472f..5856a041a 100644
--- a/docs/notes/previous_versions/supported_versions.rst
+++ b/docs/notes/previous_versions/supported_versions.rst
@@ -35,6 +35,7 @@ Version 2.14
 Version 2.6 (maintenance)
 -------------------------
 
+.. include:: v2.6.11.rst
 .. include:: v2.6.10.rst
 .. include:: v2.6.9.rst
 .. include:: v2.6.8.rst
diff --git a/docs/notes/previous_versions/v2.6.11.rst b/docs/notes/previous_versions/v2.6.11.rst
new file mode 100644
index 000000000..83f066c40
--- /dev/null
+++ b/docs/notes/previous_versions/v2.6.11.rst
@@ -0,0 +1,32 @@
+`Version 2.6.11 (maintenance) <https://fast-dds.docs.eprosima.com/en/v2.6.11/index.html>`_
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.. important::
+  According to our
+  `release support guidelines <https://github.com/eProsima/Fast-DDS/blob/master/RELEASE_SUPPORT.md>`_
+  the v2.6 minor will only receive patches for critical issues and security fixes.
+
+This release includes the following **critical fixes**:
+
+#. Fix `CVE-2025-62599 <https://www.cve.org/CVERecord?id=CVE-2025-62599>`_
+#. Fix `CVE-2025-62600 <https://www.cve.org/CVERecord?id=CVE-2025-62600>`_
+#. Fix `CVE-2025-62601 <https://www.cve.org/CVERecord?id=CVE-2025-62601>`_
+#. Fix `CVE-2025-62602 <https://www.cve.org/CVERecord?id=CVE-2025-62602>`_
+#. Fix `CVE-2025-62603 <https://www.cve.org/CVERecord?id=CVE-2025-62603>`_
+#. Fix `CVE-2025-64098 <https://www.cve.org/CVERecord?id=CVE-2025-64098>`_
+#. Fix `CVE-2025-62799 <https://www.cve.org/CVERecord?id=CVE-2025-62799>`_
+#. Fix `CVE-2025-64438 <https://www.cve.org/CVERecord?id=CVE-2025-64438>`_
+#. Fix `CVE-2025-65016 <https://www.cve.org/CVERecord?id=CVE-2025-65016>`_
+
+This release includes the following **improvements**:
+
+#. Verify Safe DDS signature
+#. Improvements in message receiver
+#. Regenerate types with Fast DDS Gen 2.1.4
+#. Upgrade to Fast CDR v1.0.29
+
+This release includes the following **ci management updates**:
+
+#. Add ``uncrustify`` to Github CI
+#. Remove deprecated windows 2019 from CI in favor of 2022
+#. Upgrade to macOS Sequoia

From eafa4fc7e8a5a5d8e51cc856df43e4e59c1dc16c Mon Sep 17 00:00:00 2001
From: Miguel Company <miguelcompany@eprosima.com>
Date: Thu, 18 Dec 2025 14:38:58 +0100
Subject: [PATCH 2/3] Refs #23085. Bump release in versions table.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
---
 docs/notes/versions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/notes/versions.rst b/docs/notes/versions.rst
index 864f6b9d0..43c7e5a51 100644
--- a/docs/notes/versions.rst
+++ b/docs/notes/versions.rst
@@ -53,7 +53,7 @@ The following table shows the currently supported versions of Fast DDS and their
       - March 2025 (*)
     * - 2.6 (maintenance)
       - `2.6.x <https://github.com/eProsima/Fast-DDS/tree/2.6.x>`__
-      - `v2.6.10 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.6.10>`__
+      - `v2.6.11 <https://github.com/eProsima/Fast-DDS/releases/tag/v2.6.11>`__
       - March 2022
       - July 2024
       - May 2025

From 3bba13b1cf60b1f5dc74bf51e4d3015d4aa15e11 Mon Sep 17 00:00:00 2001
From: Miguel Company <miguelcompany@eprosima.com>
Date: Thu, 18 Dec 2025 15:30:13 +0100
Subject: [PATCH 3/3] Refs #23085. Bump shapes-demo release

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
---
 docs/notes/versions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/notes/versions.rst b/docs/notes/versions.rst
index 43c7e5a51..596d43347 100644
--- a/docs/notes/versions.rst
+++ b/docs/notes/versions.rst
@@ -575,7 +575,7 @@ Fast DDS as the core middleware.
             * - `Fast DDS python <https://github.com/eProsima/Fast-DDS-python/>`__
               - `v1.0.2 <https://github.com/eProsima/Fast-DDS-python/releases/tag/v1.0.2>`__
             * - `Shapes Demo <https://github.com/eProsima/ShapesDemo/>`__
-              - `v2.6.10 <https://github.com/eProsima/ShapesDemo/releases/tag/v2.6.10>`__
+              - `v2.6.11 <https://github.com/eProsima/ShapesDemo/releases/tag/v2.6.11>`__
             * - `Discovery Server <https://github.com/eProsima/Discovery-Server/>`__
               - `v1.2.1 <https://github.com/eProsima/Discovery-Server/releases/tag/v1.2.1>`__