Merge branch 'maint-25' into maint

* maint-25: Updated OTP version Prepare release Update copyright year
erlang · Apr 12, 2024 · c2550b7 · c2550b7
2 parents 4d54f7a + e1e117f
commit c2550b7
Show file tree

Hide file tree

Showing 14 changed files with 267 additions and 27 deletions.
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
@@ -1447,6 +1447,99 @@
 
 </section>
 
+<section><title>Erts 13.2.2.8</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed CPU quota determination for cgroup version 2</p>
+          <p>
+	    Own Id: OTP-18999 Aux Id: GH-7928 </p>
+        </item>
+        <item>
+          <p>
+	    Fix faulty reduction counting in exiting process which
+	    could cause it to do unnecessary yielding.</p>
+          <p>
+	    Own Id: OTP-19014 </p>
+        </item>
+        <item>
+	    <p>Calling <c>erlang:trace/3</c> with first argument one
+	    of <c>ports</c>, <c>processes</c>, <c>existing_ports</c>,
+	    <c>existing_processes</c>, <c>existing</c> or <c>all</c>,
+	    could cause emulator crash if a dirty scheduler was
+	    executing a simultaneous trace action.</p>
+          <p>
+	    Own Id: OTP-19034 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed an integer overflow when the monotonic time unit
+	    reported by the operating system was greater than 10 and
+	    lower than 100 microseconds.</p>
+          <p>
+	    Own Id: OTP-19036 Aux Id: GH-8186 </p>
+        </item>
+        <item>
+          <p>
+	    When a traced process executing on a dirty scheduler
+	    received an exit signal, the dirty scheduler could use
+	    the wrong thread specific data which could lead to a
+	    crash.</p>
+          <p>
+	    Own Id: OTP-19043 Aux Id: PR-8342 </p>
+        </item>
+        <item>
+	    <p> Fixed a more or less harmless bug that caused time
+	    correction of Erlang monotonic time to become slightly
+	    off on Windows platforms when
+	    <c>QueryPerformanceCounter()</c> was used as OS monotonic
+	    time source. </p><p>
+	    <c>erlang:system_info(os_monotonic_time_source)</c> now
+	    also returns information about <i>used resolution</i>
+	    which not always corresponds to the resolution of the OS
+	    monotonic time source. </p>
+          <p>
+	    Own Id: OTP-19048 Aux Id: PR-8343 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+	    <p> Checks for monotonicity of monotonic time have been
+	    improved so that Erlang and OS monotonic time are checked
+	    separately. </p><p> A new <c>configure</c> argument
+	    <c>--enable-ensure-os-monotonic-time</c> has also been
+	    added. It enables functionality ensuring the monotonicity
+	    of monotonic timestamps delivered by the OS. When a
+	    non-monotonic timestamp is detected, it will be replaced
+	    by the last delivered monotonic timestamp before being
+	    used by Erlang's time functionality. Note that you do
+	    <i>not</i> want to enable this unless the OS monotonic
+	    time source on the system fails to produce monotonic
+	    timestamps. This since ensuring the monotonicity of OS
+	    monotonic timestamps will hurt scalability and
+	    performance of the system. </p>
+          <p>
+	    Own Id: OTP-19044 Aux Id: ERIERL-1043, PR-8342 </p>
+        </item>
+        <item>
+          <p>
+	    For severe errors, when the `socket` module terminates
+	    the Erlang VM, now an erl_crash.dump is produced, to
+	    facilitate post mortem debugging.</p>
+          <p>
+	    Own Id: OTP-19058 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 13.2.2.7</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
@@ -207,6 +207,25 @@
 
 </section>
 
+<section><title>Common_Test 1.24.0.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    With this change, the last column in common_test testcase
+	    log file is modified to now show the total sum of each
+	    time in the table rows, and Elapsed Time which is a clock
+	    time spent to run above functions. The Elapsed Time is
+	    the same time that was previously a total.</p>
+          <p>
+	    Own Id: OTP-18960 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Common_Test 1.24.0.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
@@ -207,6 +207,21 @@
 
 </section>
 
+<section><title>Crypto 5.1.4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fix building with <c>--enable-fips</c> with OpenSSL 3
+	    on MacOS.</p>
+          <p>
+	    Own Id: OTP-19038 Aux Id: GH-8271, PR-8277 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Crypto 5.1.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/debugger/doc/src/notes.xml b/lib/debugger/doc/src/notes.xml
@@ -83,6 +83,21 @@
 
 </section>
 
+<section><title>Debugger 5.3.1.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Guards with nested record expression could wrongly
+	    evaluate to false.</p>
+          <p>
+	    Own Id: OTP-18958 Aux Id: GH-8120, PR-8275 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Debugger 5.3.1.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
@@ -127,6 +127,23 @@ first.</p>
 
 </section>
 
+<section><title>diameter 2.2.7.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Reduce the impact of calling service_info by not counting
+	    the binaries (on the heap) info, This is done by
+	    introducing an option, bins_info, which controls this.</p>
+          <p>
+	    Own Id: OTP-19040 Aux Id: ERIERL-1060 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>diameter 2.2.7</title>
 
     <section><title>Improvements and New Features</title>

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
@@ -224,6 +224,21 @@
       </list>
     </section>
 
+</section>
+
+  <section><title>Inets 8.3.1.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed runtime dependencies.</p>
+          <p>
+	    Own Id: OTP-19064 </p>
+        </item>
+      </list>
+    </section>
+
 </section>
 
   <section><title>Inets 8.3.1.2</title>

diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
@@ -1028,6 +1028,22 @@
 
 </section>
 
+<section><title>Kernel 8.5.4.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed gen_udp:open/2 type spec to include already
+	    supported module socket address types.</p>
+          <p>
+	    Own Id: OTP-19050 Aux Id: OTP-18990 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 8.5.4.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
@@ -75,6 +75,21 @@
 
 </section>
 
+<section><title>Observer 2.14.0.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed runtime dependencies.</p>
+          <p>
+	    Own Id: OTP-19064 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Observer 2.14</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
@@ -1707,4 +1722,3 @@
     </section>
   </section>
 </chapter>
-
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
@@ -98,6 +98,21 @@
 
 </section>
 
+<section><title>Os_Mon 2.8.2.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed runtime dependencies.</p>
+          <p>
+	    Own Id: OTP-19064 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Os_Mon 2.8.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>

diff --git a/lib/reltool/doc/src/notes.xml b/lib/reltool/doc/src/notes.xml
@@ -75,6 +75,21 @@
       </list>
     </section>
 
+</section>
+
+  <section><title>Reltool 0.9.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed runtime dependencies.</p>
+          <p>
+	    Own Id: OTP-19064 </p>
+        </item>
+      </list>
+    </section>
+
 </section>
 
 <section><title>Reltool 0.9.1</title>

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
@@ -233,6 +233,22 @@
 
 </section>
 
+<section><title>Ssh 4.15.3.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    With this change, owner and group file attributes
+	    decoding is fixed and results with value of integer type.</p>
+          <p>
+	    Own Id: OTP-19013 Aux Id: GH-7897, PR-8220 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.15.3.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
@@ -880,6 +880,21 @@
 
 </section>
 
+<section><title>STDLIB 4.3.1.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Attempting to use the <c>maybe</c> construct in a
+	    macro argument could crash the compiler.</p>
+          <p>
+	    Own Id: OTP-19031 Aux Id: GH-8268 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 4.3.1.3</title>
 
     <section><title>Improvements and New Features</title>

diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
@@ -1,26 +0,0 @@
-OTP-18958
-OTP-18960
-OTP-18999
-OTP-19013
-OTP-19014
-OTP-19015
-OTP-19019
-OTP-19021
-OTP-19031
-OTP-19034
-OTP-19035
-OTP-19036
-OTP-19037
-OTP-19038
-OTP-19039
-OTP-19040
-OTP-19041
-OTP-19043
-OTP-19044
-OTP-19045
-OTP-19048
-OTP-19049
-OTP-19056
-OTP-19058
-OTP-19059
-OTP-19060

diff --git a/otp_versions.table b/otp_versions.table
@@ -9,6 +9,7 @@ OTP-26.1 : asn1-5.2 common_test-1.25.1 compiler-8.4 crypto-5.3 debugger-5.3.2 di
 OTP-26.0.2 : compiler-8.3.2 erts-14.0.2 kernel-9.0.2 ssh-5.0.1 ssl-11.0.2 stdlib-5.0.2 # asn1-5.1 common_test-1.25 crypto-5.2 debugger-5.3.1 dialyzer-5.1 diameter-2.3 edoc-1.2 eldap-1.2.11 erl_docgen-1.5 erl_interface-5.4 et-1.7 eunit-2.8.2 ftp-1.2 inets-9.0.1 jinterface-1.14 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 xmerl-1.3.32 :
 OTP-26.0.1 : compiler-8.3.1 erts-14.0.1 inets-9.0.1 kernel-9.0.1 ssl-11.0.1 stdlib-5.0.1 xmerl-1.3.32 # asn1-5.1 common_test-1.25 crypto-5.2 debugger-5.3.1 dialyzer-5.1 diameter-2.3 edoc-1.2 eldap-1.2.11 erl_docgen-1.5 erl_interface-5.4 et-1.7 eunit-2.8.2 ftp-1.2 jinterface-1.14 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 ssh-5.0 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 :
 OTP-26.0 : asn1-5.1 common_test-1.25 compiler-8.3 crypto-5.2 dialyzer-5.1 diameter-2.3 erl_docgen-1.5 erl_interface-5.4 erts-14.0 et-1.7 ftp-1.2 inets-9.0 jinterface-1.14 kernel-9.0 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 ssh-5.0 ssl-11.0 stdlib-5.0 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 # debugger-5.3.1 edoc-1.2 eldap-1.2.11 eunit-2.8.2 xmerl-1.3.31 :
+OTP-25.3.2.11 : common_test-1.24.0.3 crypto-5.1.4.3 debugger-5.3.1.3 diameter-2.2.7.1 erts-13.2.2.8 inets-8.3.1.3 kernel-8.5.4.3 observer-2.14.0.1 os_mon-2.8.2.1 reltool-0.9.1.1 ssh-4.15.3.4 stdlib-4.3.1.4 # asn1-5.0.21.1 compiler-8.2.6.4 dialyzer-5.0.5 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 jinterface-1.13.2 megaco-4.4.3 mnesia-4.21.4.2 odbc-2.14 parsetools-2.4.1 public_key-1.13.3.2 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.3 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 :
 OTP-25.3.2.10 : compiler-8.2.6.4 crypto-5.1.4.2 erts-13.2.2.7 ssh-4.15.3.3 # asn1-5.0.21.1 common_test-1.24.0.2 debugger-5.3.1.2 dialyzer-5.0.5 diameter-2.2.7 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.2 jinterface-1.13.2 kernel-8.5.4.2 megaco-4.4.3 mnesia-4.21.4.2 observer-2.14 odbc-2.14 os_mon-2.8.2 parsetools-2.4.1 public_key-1.13.3.2 reltool-0.9.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.3 stdlib-4.3.1.3 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 :
 OTP-25.3.2.9 : common_test-1.24.0.2 erts-13.2.2.6 ssh-4.15.3.2 # asn1-5.0.21.1 compiler-8.2.6.3 crypto-5.1.4.1 debugger-5.3.1.2 dialyzer-5.0.5 diameter-2.2.7 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.2 jinterface-1.13.2 kernel-8.5.4.2 megaco-4.4.3 mnesia-4.21.4.2 observer-2.14 odbc-2.14 os_mon-2.8.2 parsetools-2.4.1 public_key-1.13.3.2 reltool-0.9.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.3 stdlib-4.3.1.3 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 :
 OTP-25.3.2.8 : asn1-5.0.21.1 erl_interface-5.3.2.1 erts-13.2.2.5 mnesia-4.21.4.2 public_key-1.13.3.2 ssh-4.15.3.1 ssl-10.9.1.3 wx-2.2.2.1 # common_test-1.24.0.1 compiler-8.2.6.3 crypto-5.1.4.1 debugger-5.3.1.2 dialyzer-5.0.5 diameter-2.2.7 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.2 jinterface-1.13.2 kernel-8.5.4.2 megaco-4.4.3 observer-2.14 odbc-2.14 os_mon-2.8.2 parsetools-2.4.1 reltool-0.9.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 stdlib-4.3.1.3 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 xmerl-1.3.31.1 :