Merge branch 'maint-22' into maint

* maint-22:
  Updated OTP version
  Prepare release

# Conflicts:
#	OTP_VERSION
#	erts/doc/src/notes.xml
#	erts/vsn.mk
#	lib/kernel/doc/src/notes.xml
#	lib/kernel/vsn.mk
#	lib/stdlib/doc/src/notes.xml
#	lib/stdlib/vsn.mk
#	make/otp_version_tickets
#	otp_versions.table

5 files changed, 129 insertions, 1 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index a1a377db5a..9d7acda176 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -2265,6 +2265,99 @@
 
 </section>
 
+<section><title>Erts 10.7.2.13</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a bug in <c>zlib</c> where decompression would
+	    crash with <c>data_error</c> on some valid inputs. The
+	    bug could also cause extraction from a zip archive using
+	    <c>zip:extract()</c> to fail.</p>
+          <p>
+	    Own Id: OTP-17470 Aux Id: ERIERL-657 </p>
+        </item>
+        <item>
+          <p>
+	    A call to <c>erlang:cancel_timer(_, [{info, false}])</c>
+	    could cause the calling process to block forever in the
+	    call. Note that only the synchronous version of the call
+	    (that is, the <c>async</c> option is <c>false</c>) in
+	    combination with the <c>info</c> option set to
+	    <c>false</c> was effected by this bug.</p>
+          <p>
+	    Own Id: OTP-17472 Aux Id: PR-4932 </p>
+        </item>
+        <item>
+          <p>
+	    Microstate accounting (msacc) and
+	    <c>os:perf_counter()</c> unintentionally used system time
+	    instead of monotonic time for time measurements on a lot
+	    of systems. These systems were all non x86/x86_64 systems
+	    or x86/x86_64 systems without a reliable and constant
+	    rdtsc instruction.</p>
+          <p>
+	    The lock counting (lcnt) built runtime system also
+	    unintentionally used system time instead of monotonic
+	    time for time measurements on all systems.</p>
+          <p>
+	    Own Id: OTP-17493</p>
+        </item>
+        <item>
+          <p>
+	    Simultaneous calls to
+	    <c>erlang:system_flag(schedulers_online, _)</c> could
+	    cause callers to end up in a suspended state forever.</p>
+          <p>
+	    Own Id: OTP-17500 Aux Id: GH-4809 </p>
+        </item>
+        <item>
+          <p>
+	    Fix rare race bug in memory management of distribution
+	    entries. Have been seen to cause VM crash when massive
+	    number of repeated concurrent failing connection
+	    attempts.</p>
+          <p>
+	    Own Id: OTP-17513 Aux Id: GH-4964, PR-5015 </p>
+        </item>
+        <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 10.7.2.12</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 490fea65b4..710bc51473 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -1302,6 +1302,24 @@
 
 </section>
 
+<section><title>Kernel 6.5.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed rare bug that could cause net_kernel process to
+	    hang for ever. Have seen to happen with massive number of
+	    TLS connections while remote nodes are restarting. Bug
+	    exists since OTP-22.0.</p>
+          <p>
+	    Own Id: OTP-17476 Aux Id: GH-4931, PR-4934 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 6.5.2.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 53aba962aa..c8e6cf2316 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -978,6 +978,23 @@
 
 </section>
 
+<section><title>STDLIB 3.12.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix a bug that could cause a crash when formatting tuples
+	    using the control sequences <c>p</c> or <c>P</c> and
+	    limiting the output with the option <c>chars_limit</c>.</p>
+          <p>
+	    Own Id: OTP-17525 Aux Id: GH-5053 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.12.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index dd321b5ecc..e69de29bb2 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -1 +0,0 @@
-OTP-17536
diff --git a/otp_versions.table b/otp_versions.table
index 51aa06442c..d6fc650e90 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -38,6 +38,7 @@ OTP-23.0.3 : compiler-7.6.2 erts-11.0.3 # asn1-5.0.13 common_test-1.19 crypto-4.
 OTP-23.0.2 : erts-11.0.2 megaco-3.19.1 # asn1-5.0.13 common_test-1.19 compiler-7.6.1 crypto-4.7 debugger-5.0 dialyzer-4.2 diameter-2.2.3 edoc-0.12 eldap-1.2.8 erl_docgen-1.0 erl_interface-4.0 et-1.6.4 eunit-2.5 ftp-1.0.4 hipe-4.0 inets-7.2 jinterface-1.11 kernel-7.0 mnesia-4.17 observer-2.9.4 odbc-2.13 os_mon-2.5.2 parsetools-2.2 public_key-1.8 reltool-0.8 runtime_tools-1.15 sasl-4.0 snmp-5.6 ssh-4.10 ssl-10.0 stdlib-3.13 syntax_tools-2.3 tftp-1.0.2 tools-3.4 wx-1.9.1 xmerl-1.3.25 :
 OTP-23.0.1 : compiler-7.6.1 erts-11.0.1 # asn1-5.0.13 common_test-1.19 crypto-4.7 debugger-5.0 dialyzer-4.2 diameter-2.2.3 edoc-0.12 eldap-1.2.8 erl_docgen-1.0 erl_interface-4.0 et-1.6.4 eunit-2.5 ftp-1.0.4 hipe-4.0 inets-7.2 jinterface-1.11 kernel-7.0 megaco-3.19 mnesia-4.17 observer-2.9.4 odbc-2.13 os_mon-2.5.2 parsetools-2.2 public_key-1.8 reltool-0.8 runtime_tools-1.15 sasl-4.0 snmp-5.6 ssh-4.10 ssl-10.0 stdlib-3.13 syntax_tools-2.3 tftp-1.0.2 tools-3.4 wx-1.9.1 xmerl-1.3.25 :
 OTP-23.0 : asn1-5.0.13 common_test-1.19 compiler-7.6 crypto-4.7 debugger-5.0 dialyzer-4.2 edoc-0.12 erl_docgen-1.0 erl_interface-4.0 erts-11.0 eunit-2.5 hipe-4.0 inets-7.2 jinterface-1.11 kernel-7.0 megaco-3.19 mnesia-4.17 observer-2.9.4 odbc-2.13 os_mon-2.5.2 parsetools-2.2 public_key-1.8 runtime_tools-1.15 sasl-4.0 snmp-5.6 ssh-4.10 ssl-10.0 stdlib-3.13 syntax_tools-2.3 tools-3.4 wx-1.9.1 xmerl-1.3.25 # diameter-2.2.3 eldap-1.2.8 et-1.6.4 ftp-1.0.4 reltool-0.8 tftp-1.0.2 :
+OTP-22.3.4.21 : erts-10.7.2.13 kernel-6.5.2.4 stdlib-3.12.1.2 # asn1-5.0.12 common_test-1.18.2.1 compiler-7.5.4.3 crypto-4.6.5.4 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.3 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.2.2 et-1.6.4 eunit-2.4.1 ftp-1.0.4.1 hipe-3.19.3 inets-7.1.3.3 jinterface-1.10.1 megaco-3.18.8.4 mnesia-4.16.3.1 observer-2.9.3 odbc-2.12.4.1 os_mon-2.5.1.1 parsetools-2.1.8 public_key-1.7.2 reltool-0.8 runtime_tools-1.14.0.1 sasl-3.4.2 snmp-5.5.0.5 ssh-4.9.1.3 ssl-9.6.2.3 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3.1.1 wx-1.9.0.1 xmerl-1.3.24 :
 OTP-22.3.4.20 : crypto-4.6.5.4 erts-10.7.2.12 kernel-6.5.2.3 stdlib-3.12.1.1 # asn1-5.0.12 common_test-1.18.2.1 compiler-7.5.4.3 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.3 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 erl_interface-3.13.2.2 et-1.6.4 eunit-2.4.1 ftp-1.0.4.1 hipe-3.19.3 inets-7.1.3.3 jinterface-1.10.1 megaco-3.18.8.4 mnesia-4.16.3.1 observer-2.9.3 odbc-2.12.4.1 os_mon-2.5.1.1 parsetools-2.1.8 public_key-1.7.2 reltool-0.8 runtime_tools-1.14.0.1 sasl-3.4.2 snmp-5.5.0.5 ssh-4.9.1.3 ssl-9.6.2.3 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3.1.1 wx-1.9.0.1 xmerl-1.3.24 :
 OTP-22.3.4.19 : common_test-1.18.2.1 crypto-4.6.5.3 erl_interface-3.13.2.2 erts-10.7.2.11 megaco-3.18.8.4 odbc-2.12.4.1 snmp-5.5.0.5 wx-1.9.0.1 # asn1-5.0.12 compiler-7.5.4.3 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.3 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 et-1.6.4 eunit-2.4.1 ftp-1.0.4.1 hipe-3.19.3 inets-7.1.3.3 jinterface-1.10.1 kernel-6.5.2.2 mnesia-4.16.3.1 observer-2.9.3 os_mon-2.5.1.1 parsetools-2.1.8 public_key-1.7.2 reltool-0.8 runtime_tools-1.14.0.1 sasl-3.4.2 ssh-4.9.1.3 ssl-9.6.2.3 stdlib-3.12.1 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3.1.1 xmerl-1.3.24 :
 OTP-22.3.4.18 : erl_interface-3.13.2.1 erts-10.7.2.10 runtime_tools-1.14.0.1 # asn1-5.0.12 common_test-1.18.2 compiler-7.5.4.3 crypto-4.6.5.2 debugger-4.2.8 dialyzer-4.1.1 diameter-2.2.3 edoc-0.11 eldap-1.2.8 erl_docgen-0.11 et-1.6.4 eunit-2.4.1 ftp-1.0.4.1 hipe-3.19.3 inets-7.1.3.3 jinterface-1.10.1 kernel-6.5.2.2 megaco-3.18.8.3 mnesia-4.16.3.1 observer-2.9.3 odbc-2.12.4 os_mon-2.5.1.1 parsetools-2.1.8 public_key-1.7.2 reltool-0.8 sasl-3.4.2 snmp-5.5.0.4 ssh-4.9.1.3 ssl-9.6.2.3 stdlib-3.12.1 syntax_tools-2.2.1 tftp-1.0.2 tools-3.3.1.1 wx-1.9 xmerl-1.3.24 :