Merge branch 'maint-25' into maint

* maint-25: Updated OTP version Prepare release Update copyright year
erlang · Aug 18, 2022 · a61655f · a61655f
2 parents be07f10 + c028b85
commit a61655f
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 5 deletions.
diff --git a/OTP_VERSION b/OTP_VERSION
@@ -1 +1 @@
-25.0.3
+25.0.4
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
@@ -31,6 +31,43 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 13.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The <seemfa
+	    marker="erlang#monitor/3"><c>monitor/3</c></seemfa> BIF
+	    did not apply options to the created monitor if the
+	    target process or port did not exist. That is, the
+	    corresponding down message would get a <c>`DOWN`</c> tag
+	    even if a custom tag had been set, and the returned
+	    reference was not an alias even if the <c>alias</c>
+	    option had been passed.</p>
+          <p>
+	    Own Id: OTP-18190 Aux Id: GH-6185, PR-6209 </p>
+        </item>
+        <item>
+          <p>
+	    The <seemfa
+	    marker="erts:erlang#monotonic_time/1"><c>erlang:monotonic_time/1</c></seemfa>,
+	    <seemfa
+	    marker="erts:erlang#system_time/1"><c>erlang:system_time/1</c></seemfa>,
+	    <seemfa
+	    marker="erts:erlang#time_offset/1"><c>erlang:time_offset/1</c></seemfa>,
+	    and <seemfa
+	    marker="kernel:os#system_time/1"><c>os:system_time/1</c></seemfa>
+	    BIFs erroneously failed when passed the argument
+	    <c>native</c>.</p>
+          <p>
+	    Own Id: OTP-18197 Aux Id: GH-6165, PR-6213 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 13.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/erts/vsn.mk b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 13.0.3
+VSN = 13.0.4
 
 # 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
@@ -31,6 +31,26 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 8.4.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A call to <seemfa
+	    marker="net_kernel#setopts/2"><c>net_kernel:setopts(new,
+	    Opts)</c></seemfa> at the same time as a connection was
+	    being set up could cause a deadlock between the
+	    <c>net_kernel</c> process and the process setting up the
+	    connection.</p>
+          <p>
+	    Own Id: OTP-18198 Aux Id: GH-6129, PR-6216 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 8.4.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
@@ -54,7 +54,8 @@
   {<<"^8\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.4$">>,[restart_new_emulator]},
-  {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+  {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
  [{<<"^7\\.0$">>,[restart_new_emulator]},
   {<<"^7\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^7\\.1$">>,[restart_new_emulator]},
@@ -81,4 +82,5 @@
   {<<"^8\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^8\\.4$">>,[restart_new_emulator]},
-  {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 8.4.1
+KERNEL_VSN = 8.4.2
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
@@ -0,0 +1,3 @@
+OTP-18190
+OTP-18197
+OTP-18198
diff --git a/otp_versions.table b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-25.0.4 : erts-13.0.4 kernel-8.4.2 # asn1-5.0.19 common_test-1.23 compiler-8.2 crypto-5.1.1 debugger-5.3 dialyzer-5.0.1 diameter-2.2.6 edoc-1.2 eldap-1.2.10 erl_docgen-1.3 erl_interface-5.3 et-1.6.5 eunit-2.7.1 ftp-1.1.1 inets-8.0 jinterface-1.13 megaco-4.4 mnesia-4.21.1 observer-2.12 odbc-2.14 os_mon-2.7.1 parsetools-2.4 public_key-1.13 reltool-0.9 runtime_tools-1.19 sasl-4.2 snmp-5.13 ssh-4.14.1 ssl-10.8.3 stdlib-4.0.1 syntax_tools-3.0 tftp-1.0.3 tools-3.5.3 wx-2.2 xmerl-1.3.29 :
 OTP-25.0.3 : erts-13.0.3 ssl-10.8.3 # asn1-5.0.19 common_test-1.23 compiler-8.2 crypto-5.1.1 debugger-5.3 dialyzer-5.0.1 diameter-2.2.6 edoc-1.2 eldap-1.2.10 erl_docgen-1.3 erl_interface-5.3 et-1.6.5 eunit-2.7.1 ftp-1.1.1 inets-8.0 jinterface-1.13 kernel-8.4.1 megaco-4.4 mnesia-4.21.1 observer-2.12 odbc-2.14 os_mon-2.7.1 parsetools-2.4 public_key-1.13 reltool-0.9 runtime_tools-1.19 sasl-4.2 snmp-5.13 ssh-4.14.1 stdlib-4.0.1 syntax_tools-3.0 tftp-1.0.3 tools-3.5.3 wx-2.2 xmerl-1.3.29 :
 OTP-25.0.2 : erts-13.0.2 ssl-10.8.2 # asn1-5.0.19 common_test-1.23 compiler-8.2 crypto-5.1.1 debugger-5.3 dialyzer-5.0.1 diameter-2.2.6 edoc-1.2 eldap-1.2.10 erl_docgen-1.3 erl_interface-5.3 et-1.6.5 eunit-2.7.1 ftp-1.1.1 inets-8.0 jinterface-1.13 kernel-8.4.1 megaco-4.4 mnesia-4.21.1 observer-2.12 odbc-2.14 os_mon-2.7.1 parsetools-2.4 public_key-1.13 reltool-0.9 runtime_tools-1.19 sasl-4.2 snmp-5.13 ssh-4.14.1 stdlib-4.0.1 syntax_tools-3.0 tftp-1.0.3 tools-3.5.3 wx-2.2 xmerl-1.3.29 :
 OTP-25.0.1 : crypto-5.1.1 dialyzer-5.0.1 erts-13.0.1 kernel-8.4.1 mnesia-4.21.1 ssh-4.14.1 ssl-10.8.1 stdlib-4.0.1 # asn1-5.0.19 common_test-1.23 compiler-8.2 debugger-5.3 diameter-2.2.6 edoc-1.2 eldap-1.2.10 erl_docgen-1.3 erl_interface-5.3 et-1.6.5 eunit-2.7.1 ftp-1.1.1 inets-8.0 jinterface-1.13 megaco-4.4 observer-2.12 odbc-2.14 os_mon-2.7.1 parsetools-2.4 public_key-1.13 reltool-0.9 runtime_tools-1.19 sasl-4.2 snmp-5.13 syntax_tools-3.0 tftp-1.0.3 tools-3.5.3 wx-2.2 xmerl-1.3.29 :