From 7604915ccecd53cf34cf8238e9d30e31d2b81ae6 Mon Sep 17 00:00:00 2001
From: Dave Rodgman <dave.rodgman@arm.com>
Date: Tue, 7 Nov 2023 12:33:17 +0000
Subject: [PATCH] Update Changelog with bugfix entry

Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
---
 ChangeLog                                  | 4 ++++
 ChangeLog.d/fix-3rdparty-target-prefix.txt | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)
 delete mode 100644 ChangeLog.d/fix-3rdparty-target-prefix.txt

diff --git a/ChangeLog b/ChangeLog
index 3e3dc10864..28c45f718f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,10 @@ Changes
    *  Mbed TLS is now released under a dual Apache-2.0 OR GPL-2.0-or-later
       license. Users may choose which license they take the code under.
 
+Bugfix
+   * Fix accidental omission of MBEDTLS_TARGET_PREFIX in 3rdparty modules
+     in CMake.
+
 = Mbed TLS 3.5.0 branch released 2023-10-05
 
 API changes
diff --git a/ChangeLog.d/fix-3rdparty-target-prefix.txt b/ChangeLog.d/fix-3rdparty-target-prefix.txt
deleted file mode 100644
index db8ed07eeb..0000000000
--- a/ChangeLog.d/fix-3rdparty-target-prefix.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Bugfix
-   * Fix accidental omission of MBEDTLS_TARGET_PREFIX in 3rdparty modules
-     in CMake.