Merge branch 'maint-25' into maint

* maint-25:
  Updated OTP version
  Prepare release
  Update copyright year

9 files changed, 75 insertions, 8 deletions

diff --git a/erts/configure.ac b/erts/configure.ac
index a052c319ba..307be5042d 100644
--- a/erts/configure.ac
+++ b/erts/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. -*-Autoconf-*
 
 dnl %CopyrightBegin%
 dnl
-dnl Copyright Ericsson AB 1997-2022. All Rights Reserved.
+dnl Copyright Ericsson AB 1997-2023. All Rights Reserved.
 dnl
 dnl Licensed under the Apache License, Version 2.0 (the "License");
 dnl you may not use this file except in compliance with the License.
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index c3e77c0fbd..d31a438ede 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,73 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 13.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a bug in the loader that prevented certain
+	    modules compiled with <c>no_ssa_opt</c> from being
+	    loaded.</p>
+          <p>
+	    Own Id: OTP-18519 Aux Id: GH-7024 </p>
+        </item>
+        <item>
+          <p>
+	    Implementations of the <seecref
+	    marker="erts:driver_entry#call"><c>call()</c></seecref>
+	    driver callback that returned a faulty encoded result
+	    could cause a memory leak and could cause invalid data on
+	    the heap of the processes calling <seemfa
+	    marker="erts:erlang#port_call/3"><c>erlang:port_call/3</c></seemfa>.</p>
+          <p>
+	    Own Id: OTP-18525 Aux Id: PR-7049 </p>
+        </item>
+        <item>
+	    <p>Fixed a memory corruption issue when upgrading code.
+	    The bug was introduced in <c>OTP 25.3</c></p>
+          <p>
+	    Own Id: OTP-18553</p>
+        </item>
+        <item>
+	    <p>Fixed configure tests for a few ARM-specific
+	    instructions, which prevented the emulator from being
+	    built on some platforms.</p>
+          <p>
+	    Own Id: OTP-18554</p>
+        </item>
+        <item>
+          <p>
+	    Aliases created in combination with a monitor using the
+	    <c>{alias, explicit_unalias}</c> option stopped working
+	    from remote nodes when a <c>'DOWN'</c> signal had been
+	    received due to the monitor or if the monitor was removed
+	    using the <c>erlang:demonitor()</c> BIF.</p>
+          <p>
+	    This bug was introduced in OTP 24.3.4.10 and OTP 25.3.</p>
+          <p>
+	    Own Id: OTP-18557 Aux Id: PR-7131, OTP-18496 </p>
+        </item>
+        <item>
+	    <p>In rare circumstances, bit syntax matching of an
+	    invalid code point for a <c>utf32</c> would crash the
+	    runtime system.</p>
+          <p>
+	    Own Id: OTP-18560</p>
+        </item>
+        <item>
+          <p>
+	    Building the runtime system failed when native atomic
+	    support was missing. Note that execution on such systems
+	    have only been rudimentary tested.</p>
+          <p>
+	    Own Id: OTP-18563 Aux Id: GH-7114, PR-7159 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 13.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/emulator/beam/emu/ops.tab b/erts/emulator/beam/emu/ops.tab
index fed0ef4293..c9d87f071b 100644
--- a/erts/emulator/beam/emu/ops.tab
+++ b/erts/emulator/beam/emu/ops.tab
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2022. All Rights Reserved.
+# Copyright Ericsson AB 1997-2023. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/erts/emulator/beam/erl_process_lock.h b/erts/emulator/beam/erl_process_lock.h
index 1dd9f14317..76e8616280 100644
--- a/erts/emulator/beam/erl_process_lock.h
+++ b/erts/emulator/beam/erl_process_lock.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 2007-2021. All Rights Reserved.
+ * Copyright Ericsson AB 2007-2023. All Rights Reserved.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/emulator/beam/jit/arm/ops.tab b/erts/emulator/beam/jit/arm/ops.tab
index 3c4f4c218f..9cd7a9d925 100644
--- a/erts/emulator/beam/jit/arm/ops.tab
+++ b/erts/emulator/beam/jit/arm/ops.tab
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2022. All Rights Reserved.
+# Copyright Ericsson AB 1997-2023. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/erts/emulator/beam/jit/x86/instr_guard_bifs.cpp b/erts/emulator/beam/jit/x86/instr_guard_bifs.cpp
index 26133d5ac0..9ef5486568 100644
--- a/erts/emulator/beam/jit/x86/instr_guard_bifs.cpp
+++ b/erts/emulator/beam/jit/x86/instr_guard_bifs.cpp
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2020-2022. All Rights Reserved.
+ * Copyright Ericsson AB 2020-2023. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/emulator/beam/jit/x86/ops.tab b/erts/emulator/beam/jit/x86/ops.tab
index 8a5dc79c35..99cd96ac8b 100644
--- a/erts/emulator/beam/jit/x86/ops.tab
+++ b/erts/emulator/beam/jit/x86/ops.tab
@@ -1,7 +1,7 @@
 #
 # %CopyrightBegin%
 #
-# Copyright Ericsson AB 1997-2022. All Rights Reserved.
+# Copyright Ericsson AB 1997-2023. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
diff --git a/erts/emulator/test/bs_utf_SUITE.erl b/erts/emulator/test/bs_utf_SUITE.erl
index 8885b31324..68099c6f39 100644
--- a/erts/emulator/test/bs_utf_SUITE.erl
+++ b/erts/emulator/test/bs_utf_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2008-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2023. All Rights Reserved.
 %% 
 %% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
diff --git a/erts/vsn.mk b/erts/vsn.mk
index c9cabd73d4..44cd2f0475 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 13.2
+VSN = 13.2.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3