Merge branch 'maint' into master

Michal Wasowski · Michal Wasowski · commit 8cc569cfabd5 · 2025-10-20T15:55:29.000+02:00
* maint:
  Updated OTP version
  Prepare release
diff --git a/erts/doc/notes.md b/erts/doc/notes.md
@@ -23,6 +23,21 @@ limitations under the License.
 
 This document describes the changes made to the ERTS application.
 
+## Erts 16.1.1
+
+### Fixed Bugs and Malfunctions
+
+- Fixed the `erl` documentation of the default timewarp mode used.
+
+  Own Id: OTP-19790 Aux Id: [PR-9970]
+
+- The `erlang:suspend_process()` BIFs failed to suspend processes currently executing on dirty schedulers.
+
+  Own Id: OTP-19799 Aux Id: [PR-10241]
+
+[PR-9970]: https://github.com/erlang/otp/pull/9970
+[PR-10241]: https://github.com/erlang/otp/pull/10241
+
 ## Erts 16.1
 
 ### Fixed Bugs and Malfunctions
diff --git a/erts/vsn.mk b/erts/vsn.mk
@@ -20,7 +20,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 16.1
+VSN = 16.1.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/diameter/doc/notes.md b/lib/diameter/doc/notes.md
@@ -23,6 +23,17 @@ limitations under the License.
 
 Releases are listed in reverse chronological order, most recent first.
 
+## diameter 2.5.2
+
+### Fixed Bugs and Malfunctions
+
+- Added documentation about 'proxy' and 'resend' options in diameter:handle_request/3
+
+  Own Id: OTP-19768 Aux Id: [GH-10150], [PR-10182]
+
+[GH-10150]: https://github.com/erlang/otp/issues/10150
+[PR-10182]: https://github.com/erlang/otp/pull/10182
+
 ## diameter 2.5.1
 
 ### Fixed Bugs and Malfunctions
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
@@ -19,5 +19,5 @@
 # %CopyrightEnd%
 
 APPLICATION  = diameter
-DIAMETER_VSN = 2.5.1
+DIAMETER_VSN = 2.5.2
 APP_VSN      = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/kernel/doc/notes.md b/lib/kernel/doc/notes.md
@@ -23,6 +23,16 @@ limitations under the License.
 
 This document describes the changes made to the Kernel application.
 
+## Kernel 10.4.1
+
+### Fixed Bugs and Malfunctions
+
+- With this change group.erl will not crash when receiving unknown message.
+
+  Own Id: OTP-19796 Aux Id: ERIERL-1264, [PR-10248]
+
+[PR-10248]: https://github.com/erlang/otp/pull/10248
+
 ## Kernel 10.4
 
 ### Fixed Bugs and Malfunctions
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
@@ -50,6 +50,8 @@
   {<<"^10\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^10\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^10\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^10\\.4$">>,[restart_new_emulator]},
+  {<<"^10\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^9\\.0$">>,[restart_new_emulator]},
   {<<"^9\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^9\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -82,6 +84,8 @@
   {<<"^10\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^10\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^10\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^10\\.4$">>,[restart_new_emulator]},
+  {<<"^10\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^9\\.0$">>,[restart_new_emulator]},
   {<<"^9\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^9\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
@@ -1,4 +1,4 @@
-KERNEL_VSN = 10.4
+KERNEL_VSN = 10.4.1
 
 # %CopyrightBegin%
 #
diff --git a/lib/ssl/doc/notes.md b/lib/ssl/doc/notes.md
@@ -23,6 +23,34 @@ limitations under the License.
 
 This document describes the changes made to the SSL application.
 
+## SSL 11.4.1
+
+### Fixed Bugs and Malfunctions
+
+- Fixed so that sending of application data will adhere to max_fragment_length. This was broken in OTP-27 release by an optimization.
+
+  Own Id: OTP-19774 Aux Id: [GH-10191], [PR-10201]
+
+- PR-10046 put to hard requirements on key file content. Make sure same file can be used as keyfile and certfile
+
+  Own Id: OTP-19780 Aux Id: [GH-10217], [GH-10212], [PR-10221]
+
+- Assert that hello extensions are unique and send an illegal parameter alert if they are not.
+
+  Own Id: OTP-19791 Aux Id: [PR-10245]
+
+- Avoid sending an internal message to the user process in conjunction with handling a key update.
+
+  Own Id: OTP-19806 Aux Id: [PR-10274]
+
+[GH-10191]: https://github.com/erlang/otp/issues/10191
+[PR-10201]: https://github.com/erlang/otp/pull/10201
+[GH-10217]: https://github.com/erlang/otp/issues/10217
+[GH-10212]: https://github.com/erlang/otp/issues/10212
+[PR-10221]: https://github.com/erlang/otp/pull/10221
+[PR-10245]: https://github.com/erlang/otp/pull/10245
+[PR-10274]: https://github.com/erlang/otp/pull/10274
+
 ## SSL 11.4
 
 ### Fixed Bugs and Malfunctions
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
@@ -1,4 +1,4 @@
-SSL_VSN = 11.4
+SSL_VSN = 11.4.1
 
 # %CopyrightBegin%
 #
diff --git a/lib/xmerl/doc/notes.md b/lib/xmerl/doc/notes.md
@@ -23,6 +23,16 @@ limitations under the License.
 
 This document describes the changes made to the Xmerl application.
 
+## Xmerl 2.1.7
+
+### Fixed Bugs and Malfunctions
+
+- The XSD validation failed due to not handling the optional text blocks correctly in an XSD complex type with attribute `mixed=true`.
+
+  Own Id: OTP-19792 Aux Id: ERERL-1261,[PR-10249]
+
+[PR-10249]: https://github.com/erlang/otp/pull/10249
+
 ## Xmerl 2.1.6
 
 ### Fixed Bugs and Malfunctions
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
@@ -1,4 +1,4 @@
-XMERL_VSN = 2.1.6
+XMERL_VSN = 2.1.7
 
 # %CopyrightBegin%
 #
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
@@ -1,58 +0,0 @@
-OTP-16607
-OTP-19552
-OTP-19619
-OTP-19642
-OTP-19646
-OTP-19647
-OTP-19648
-OTP-19649
-OTP-19651
-OTP-19655
-OTP-19657
-OTP-19659
-OTP-19660
-OTP-19666
-OTP-19667
-OTP-19669
-OTP-19671
-OTP-19677
-OTP-19681
-OTP-19685
-OTP-19686
-OTP-19688
-OTP-19689
-OTP-19692
-OTP-19693
-OTP-19694
-OTP-19696
-OTP-19698
-OTP-19704
-OTP-19706
-OTP-19714
-OTP-19719
-OTP-19720
-OTP-19721
-OTP-19722
-OTP-19723
-OTP-19724
-OTP-19725
-OTP-19726
-OTP-19727
-OTP-19728
-OTP-19730
-OTP-19731
-OTP-19732
-OTP-19733
-OTP-19735
-OTP-19736
-OTP-19737
-OTP-19739
-OTP-19745
-OTP-19749
-OTP-19752
-OTP-19754
-OTP-19756
-OTP-19757
-OTP-19758
-OTP-19759
-OTP-19760
diff --git a/otp_versions.table b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-28.1.1 : diameter-2.5.2 erts-16.1.1 kernel-10.4.1 ssl-11.4.1 xmerl-2.1.7 # asn1-5.4.2 common_test-1.29 compiler-9.0.2 crypto-5.7 debugger-6.0.3 dialyzer-5.4 edoc-1.4.1 eldap-1.2.16 erl_interface-5.6.1 et-1.7.2 eunit-2.10 ftp-1.2.4 inets-9.4.2 jinterface-1.15 megaco-4.8.1 mnesia-4.24.1 observer-2.18.1 odbc-2.16 os_mon-2.11.1 parsetools-2.7 public_key-1.18.3 reltool-1.0.2 runtime_tools-2.3 sasl-4.3 snmp-5.19.1 ssh-5.3.3 stdlib-7.1 syntax_tools-4.0.1 tftp-1.2.3 tools-4.1.3 wx-2.5.2 :
 OTP-28.1 : asn1-5.4.2 common_test-1.29 compiler-9.0.2 crypto-5.7 debugger-6.0.3 edoc-1.4.1 erl_interface-5.6.1 erts-16.1 inets-9.4.2 kernel-10.4 megaco-4.8.1 mnesia-4.24.1 observer-2.18.1 os_mon-2.11.1 public_key-1.18.3 runtime_tools-2.3 snmp-5.19.1 ssl-11.4 stdlib-7.1 syntax_tools-4.0.1 tools-4.1.3 wx-2.5.2 xmerl-2.1.6 # dialyzer-5.4 diameter-2.5.1 eldap-1.2.16 et-1.7.2 eunit-2.10 ftp-1.2.4 jinterface-1.15 odbc-2.16 parsetools-2.7 reltool-1.0.2 sasl-4.3 ssh-5.3.3 tftp-1.2.3 :
 OTP-28.0.4 : inets-9.4.1 # asn1-5.4.1 common_test-1.28 compiler-9.0.1 crypto-5.6 debugger-6.0.2 dialyzer-5.4 diameter-2.5.1 edoc-1.4 eldap-1.2.16 erl_interface-5.6 erts-16.0.3 et-1.7.2 eunit-2.10 ftp-1.2.4 jinterface-1.15 kernel-10.3.2 megaco-4.8 mnesia-4.24 observer-2.18 odbc-2.16 os_mon-2.11 parsetools-2.7 public_key-1.18.2 reltool-1.0.2 runtime_tools-2.2 sasl-4.3 snmp-5.19 ssh-5.3.3 ssl-11.3.2 stdlib-7.0.3 syntax_tools-4.0 tftp-1.2.3 tools-4.1.2 wx-2.5.1 xmerl-2.1.5 :
 OTP-28.0.3 : diameter-2.5.1 erts-16.0.3 ssh-5.3.3 stdlib-7.0.3 # asn1-5.4.1 common_test-1.28 compiler-9.0.1 crypto-5.6 debugger-6.0.2 dialyzer-5.4 edoc-1.4 eldap-1.2.16 erl_interface-5.6 et-1.7.2 eunit-2.10 ftp-1.2.4 inets-9.4 jinterface-1.15 kernel-10.3.2 megaco-4.8 mnesia-4.24 observer-2.18 odbc-2.16 os_mon-2.11 parsetools-2.7 public_key-1.18.2 reltool-1.0.2 runtime_tools-2.2 sasl-4.3 snmp-5.19 ssl-11.3.2 syntax_tools-4.0 tftp-1.2.3 tools-4.1.2 wx-2.5.1 xmerl-2.1.5 :

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`# %CopyrightEnd%`
`21`	`21`	`#`
`22`	`22`
`23`		`-VSN = 16.1`
	`23`	`+VSN = 16.1.1`
`24`	`24`
`25`	`25`	`# Port number 4365 in 4.2`
`26`	`26`	`# Port number 4366 in 4.3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-KERNEL_VSN = 10.4`
	`1`	`+KERNEL_VSN = 10.4.1`
`2`	`2`
`3`	`3`	`# %CopyrightBegin%`
`4`	`4`	`#`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-SSL_VSN = 11.4`
	`1`	`+SSL_VSN = 11.4.1`
`2`	`2`
`3`	`3`	`# %CopyrightBegin%`
`4`	`4`	`#`