summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2021-09-02 12:45:28 +0200
committerErlang/OTP <otp@erlang.org>2021-09-02 12:45:28 +0200
commit3c3d074d91f689fe4392db3af2ad27973e083efc (patch)
tree223a659c3ca34e2eac0fc4481c6ca7a12b2cbf1d
parent987bdca44b13ed0c986a50ebc2dbbabc1db79b7a (diff)
downloaderlang-3c3d074d91f689fe4392db3af2ad27973e083efc.tar.gz
Prepare release
-rw-r--r--erts/doc/src/notes.xml42
-rw-r--r--erts/vsn.mk2
-rw-r--r--lib/kernel/doc/src/notes.xml16
-rw-r--r--lib/kernel/vsn.mk2
-rw-r--r--make/otp_version_tickets15
5 files changed, 65 insertions, 12 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 2abbe21583..e3ad22784f 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,48 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 11.2.2.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix buffer overrun problem in the tty driver. The problem
+ happens on some platforms when using the CTRL+R
+ functionality of newshell with very long strings in the
+ history.</p>
+ <p>
+ Own Id: OTP-17560 Aux Id: GH-5116 </p>
+ </item>
+ <item>
+ <p>
+ Fix race-condition that could cause a crash when tracing
+ scheduling or garbage collections on a process that was
+ running on a dirty scheduler.</p>
+ <p>
+ Own Id: OTP-17568 Aux Id: PR-4940 </p>
+ </item>
+ <item>
+ <p>
+ Fix rare bug where re:run would crash/return invalid
+ results when given a subbinary as subject.</p>
+ <p>
+ This bug has existed since Erlang/OTP 20.0.</p>
+ <p>
+ Own Id: OTP-17585 Aux Id: GH-5150 </p>
+ </item>
+ <item>
+ <p><c>binary_to_term/1,2</c> is now more resilient
+ against corrupted binaries containing maps in the
+ external format.</p>
+ <p>
+ Own Id: OTP-17594</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 11.2.2.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index aa26bdaa93..1c962e09ba 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 11.2.2.4
+VSN = 11.2.2.5
# Port number 4365 in 4.2
# Port number 4366 in 4.3
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 9648da4617..45496df375 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,22 @@
</header>
<p>This document describes the changes made to the Kernel application.</p>
+<section><title>Kernel 7.3.1.3</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix code:get_doc/1 to not crash when module is located in
+ an escript.</p>
+ <p>
+ Own Id: OTP-17570 Aux Id: PR-5139 GH-4256 ERL-1261 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Kernel 7.3.1.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 31899eb629..8c348c98bb 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 7.3.1.2
+KERNEL_VSN = 7.3.1.3
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index cc38290323..57c3ef5fda 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,11 +1,6 @@
OTP-16607
-OTP-17150
-OTP-17475
-OTP-17493
-OTP-17500
-OTP-17506
-OTP-17509
-OTP-17513
-OTP-17522
-OTP-17525
-OTP-17529
+OTP-17560
+OTP-17568
+OTP-17570
+OTP-17585
+OTP-17594