Merge branch 'maint-25' into maint

* maint-25:
  Updated OTP version
  Prepare release
  Update copyright year

9 files changed, 46 insertions, 6 deletions

diff --git a/OTP_VERSION b/OTP_VERSION
index 139ab877a8..44c5306e24 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-25.1.1
+25.1.2
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index be3e172b33..b7f973eb46 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,27 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 13.1.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add abandon carrier free utilization limit
+	    (<c>+Muacful</c>) option to erts_alloc. This option
+	    allows the user to mark unused segments in a memory
+	    carrier as re-useable by the OS if needed.</p>
+          <p>
+	    This functionality was a non-configurable default before
+	    Erlang/OTP 25, but removed due to performance issues.</p>
+          <p>
+	    Own Id: OTP-18290 Aux Id: ERIERL-866 PR-6378 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 13.1.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h
index 399fa2ccff..84d215e0f0 100644
--- a/erts/emulator/beam/erl_alloc_util.h
+++ b/erts/emulator/beam/erl_alloc_util.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2002-2021. All Rights Reserved.
+ * Copyright Ericsson AB 2002-2022. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/emulator/sys/common/erl_mmap.h b/erts/emulator/sys/common/erl_mmap.h
index e4e9dfb7ae..ecb1ef6a13 100644
--- a/erts/emulator/sys/common/erl_mmap.h
+++ b/erts/emulator/sys/common/erl_mmap.h
@@ -1,7 +1,7 @@
 /*
  * %CopyrightBegin%
  *
- * Copyright Ericsson AB 2013-2021. All Rights Reserved.
+ * Copyright Ericsson AB 2013-2022. All Rights Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/erts/vsn.mk b/erts/vsn.mk
index e2c368b210..b9c4a16c55 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 13.1.1
+VSN = 13.1.2
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 128ff303ee..1362f61dd6 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,23 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.21.1</title>
+  <section><title>Mnesia 4.21.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Don't fill the logs if mnesia can't connect to all nodes,
+	    due to partitioned network.</p>
+          <p>
+	    Own Id: OTP-18288 Aux Id: ERIERL-868 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.21.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 179d3ee6d0..13a0738be2 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.21.1
+MNESIA_VSN = 4.21.2
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..1437e042af 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,2 @@
+OTP-18288
+OTP-18290
diff --git a/otp_versions.table b/otp_versions.table
index a1f38c0c5b..e9ee8ed617 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-25.1.2 : erts-13.1.2 mnesia-4.21.2 # asn1-5.0.21 common_test-1.23.1 compiler-8.2.1 crypto-5.1.2 debugger-5.3 dialyzer-5.0.3 diameter-2.2.7 edoc-1.2 eldap-1.2.10 erl_docgen-1.4 erl_interface-5.3 et-1.6.5 eunit-2.8.1 ftp-1.1.1 inets-8.1 jinterface-1.13.1 kernel-8.5.1 megaco-4.4.1 observer-2.13 odbc-2.14 os_mon-2.7.1 parsetools-2.4.1 public_key-1.13.1 reltool-0.9 runtime_tools-1.19 sasl-4.2 snmp-5.13.1 ssh-4.15 ssl-10.8.5 stdlib-4.1.1 syntax_tools-3.0 tftp-1.0.3 tools-3.5.3 wx-2.2 xmerl-1.3.30 :
 OTP-25.1.1 : asn1-5.0.21 dialyzer-5.0.3 erts-13.1.1 eunit-2.8.1 kernel-8.5.1 ssl-10.8.5 stdlib-4.1.1 # common_test-1.23.1 compiler-8.2.1 crypto-5.1.2 debugger-5.3 diameter-2.2.7 edoc-1.2 eldap-1.2.10 erl_docgen-1.4 erl_interface-5.3 et-1.6.5 ftp-1.1.1 inets-8.1 jinterface-1.13.1 megaco-4.4.1 mnesia-4.21.1 observer-2.13 odbc-2.14 os_mon-2.7.1 parsetools-2.4.1 public_key-1.13.1 reltool-0.9 runtime_tools-1.19 sasl-4.2 snmp-5.13.1 ssh-4.15 syntax_tools-3.0 tftp-1.0.3 tools-3.5.3 wx-2.2 xmerl-1.3.30 :
 OTP-25.1 : asn1-5.0.20 common_test-1.23.1 compiler-8.2.1 crypto-5.1.2 dialyzer-5.0.2 diameter-2.2.7 erl_docgen-1.4 erts-13.1 eunit-2.8 inets-8.1 jinterface-1.13.1 kernel-8.5 megaco-4.4.1 observer-2.13 parsetools-2.4.1 public_key-1.13.1 snmp-5.13.1 ssh-4.15 ssl-10.8.4 stdlib-4.1 xmerl-1.3.30 # debugger-5.3 edoc-1.2 eldap-1.2.10 erl_interface-5.3 et-1.6.5 ftp-1.1.1 mnesia-4.21.1 odbc-2.14 os_mon-2.7.1 reltool-0.9 runtime_tools-1.19 sasl-4.2 syntax_tools-3.0 tftp-1.0.3 tools-3.5.3 wx-2.2 :
 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 :