Merge branch 'maint-24' into maint

* maint-24:
  Updated OTP version
  Prepare release

# Conflicts:
#	make/otp_version_tickets

13 files changed, 144 insertions, 8 deletions

diff --git a/OTP_VERSION b/OTP_VERSION
index 0dad123924..b3ef8a50a4 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-24.1
+24.1.1
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 0c383fd5d0..da2d96af4d 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,70 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 12.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A race between an exiting port and handling of
+	    simultaneously received signals to that port could cause
+	    a runtime system crash. The effected signals are
+	    <c>link</c>, <c>monitor</c> and <c>demonitor</c>. On OTP
+	    22 a similiar race could also cause a memory leak when
+	    receiving an <c>unlink</c> signal.</p>
+          <p>
+	    Own Id: OTP-17642 Aux Id: PR-5248 </p>
+        </item>
+        <item>
+          <p>
+	    <seemfa marker="erts:erlang#monitor/3">A user defined tag
+	    on a monitor message</seemfa> could cause the runtime
+	    system to crash when the monitor message had been
+	    received.</p>
+          <p>
+	    Own Id: OTP-17646 Aux Id: GH-5221, PR-5232 </p>
+        </item>
+        <item>
+          <p>
+	    A call to <seemfa
+	    marker="erts:erlang#demonitor/1"><c>erlang:demonitor(Ref)</c></seemfa>
+	    where the reference <c>Ref</c> referred to an active
+	    alias, but not an active monitor, caused the runtime
+	    system to crash.</p>
+          <p>
+	    Own Id: OTP-17647 Aux Id: GH-5225, PR-5230 </p>
+        </item>
+        <item>
+          <p>
+	    The message queue of a process entered an inconsistent
+	    state after a <c>receive</c> expression with an invalid
+	    timeout value was executed. If the exception raised due
+	    to the invalid timeout value was caught, the following
+	    <c>receive</c> expression executed by the process could
+	    fail to match messages already present in the message
+	    queue.</p>
+          <p>
+	    On OTP 24 this could also cause the whole runtime system
+	    to crash.</p>
+          <p>
+	    Own Id: OTP-17651 Aux Id: GH-5235, PR-5244 </p>
+        </item>
+        <item>
+          <p>
+	    Sending a <c>Port ! {PortOwner, close}</c> signal from a
+	    process other than the port owner could erroneously
+	    trigger a <c>badsig</c> exit signal being sent to the
+	    port owner process even though the correct
+	    <c>PortOwner</c> had been passed in the signal.</p>
+          <p>
+	    Own Id: OTP-17665 Aux Id: PR-5248 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 12.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index c90d6f9d07..a9ffb183b6 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 12.1
+VSN = 12.1.1
 
 # 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
index a97569b605..934f0629bf 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,22 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 8.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Add more info about the socket 'type' ('socket' or
+	    'port') for the DOWN message when monitoring sockets.</p>
+          <p>
+	    Own Id: OTP-17640</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 8.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
index b54798cc47..bbafb4f8fb 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -48,7 +48,9 @@
   {<<"^8\\.0$">>,[restart_new_emulator]},
   {<<"^8\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+  {<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^8\\.1$">>,[restart_new_emulator]},
+  {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
  [{<<"^6\\.4$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -69,4 +71,6 @@
   {<<"^8\\.0$">>,[restart_new_emulator]},
   {<<"^8\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
-  {<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+  {<<"^8\\.0\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^8\\.1$">>,[restart_new_emulator]},
+  {<<"^8\\.1\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 9fb2df64b6..b2d30db8a7 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 8.1
+KERNEL_VSN = 8.1.1
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index a1509f7d0f..295c2d7662 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,24 @@
   </header>
 
 
-  <section><title>SNMP 5.10</title>
+  <section><title>SNMP 5.10.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Sockets are monitored, but the handling of the 'DOWN'
+	    message expected a new style socket ('socket'), old style
+	    (port) was not handled.</p>
+          <p>
+	    Own Id: OTP-17641 Aux Id: OTP-17640 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>SNMP 5.10</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index 06276ca81b..4733cf3504 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = snmp
-SNMP_VSN    = 5.10
+SNMP_VSN    = 5.10.1
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index f785772067..1ec4deb4f3 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,28 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.16.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a bug that could cause a child to become orphaned
+	    when a supervisor died between unlinking and sending the
+	    shutdown signal to this child. </p>
+          <p>
+	    There was also a possibility for erratic supervisor
+	    reports caused by a race between a supervisor shutting
+	    down a child and that child exiting by itself at the same
+	    time.</p>
+          <p>
+	    Own Id: OTP-17649 Aux Id: GH-5193, PR-5201 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.16</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 45850b6de8..6f24f4f22b 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -49,6 +49,8 @@
   {<<"^3\\.15\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.15\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.15\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.16$">>,[restart_new_emulator]},
+  {<<"^3\\.16\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.9$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -74,6 +76,8 @@
   {<<"^3\\.15\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.15\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.15\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+  {<<"^3\\.16$">>,[restart_new_emulator]},
+  {<<"^3\\.16\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.9$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index cd0cb10873..32125b6feb 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.16
+STDLIB_VSN = 3.16.1
diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge
index e69de29bb2..775591c8b2 100644
--- a/make/otp_version_tickets_in_merge
+++ b/make/otp_version_tickets_in_merge
@@ -0,0 +1,8 @@
+OTP-17640
+OTP-17641
+OTP-17642
+OTP-17646
+OTP-17647
+OTP-17649
+OTP-17651
+OTP-17665
diff --git a/otp_versions.table b/otp_versions.table
index 7899dd8f53..b1c033eb0d 100644
--- a/otp_versions.table
+++ b/otp_versions.table
@@ -1,3 +1,4 @@
+OTP-24.1.1 : erts-12.1.1 kernel-8.1.1 snmp-5.10.1 stdlib-3.16.1 # asn1-5.0.17 common_test-1.21 compiler-8.0.3 crypto-5.0.3 debugger-5.2 dialyzer-4.4.2 diameter-2.2.4 edoc-1.0.1 eldap-1.2.9 erl_docgen-1.1.2 erl_interface-5.1 et-1.6.5 eunit-2.7 ftp-1.1 inets-7.4.2 jinterface-1.12.1 megaco-4.1 mnesia-4.20 observer-2.10 odbc-2.13.5 os_mon-2.7.1 parsetools-2.3.1 public_key-1.11.2 reltool-0.9 runtime_tools-1.17 sasl-4.1 ssh-4.12.4 ssl-10.5 syntax_tools-2.6 tftp-1.0.3 tools-3.5.1 wx-2.1 xmerl-1.3.28 :
 OTP-24.1 : asn1-5.0.17 common_test-1.21 compiler-8.0.3 crypto-5.0.3 debugger-5.2 dialyzer-4.4.2 edoc-1.0.1 erl_docgen-1.1.2 erl_interface-5.1 erts-12.1 eunit-2.7 inets-7.4.2 jinterface-1.12.1 kernel-8.1 megaco-4.1 mnesia-4.20 observer-2.10 os_mon-2.7.1 parsetools-2.3.1 public_key-1.11.2 runtime_tools-1.17 snmp-5.10 ssh-4.12.4 ssl-10.5 stdlib-3.16 tools-3.5.1 wx-2.1 # diameter-2.2.4 eldap-1.2.9 et-1.6.5 ftp-1.1 odbc-2.13.5 reltool-0.9 sasl-4.1 syntax_tools-2.6 tftp-1.0.3 xmerl-1.3.28 :
 OTP-24.0.6 : erts-12.0.4 # asn1-5.0.16 common_test-1.20.5 compiler-8.0.2 crypto-5.0.2 debugger-5.1 dialyzer-4.4.1 diameter-2.2.4 edoc-1.0 eldap-1.2.9 erl_docgen-1.1.1 erl_interface-5.0.1 et-1.6.5 eunit-2.6.1 ftp-1.1 inets-7.4.1 jinterface-1.12 kernel-8.0.2 megaco-4.0.1 mnesia-4.19.1 observer-2.9.6 odbc-2.13.5 os_mon-2.7 parsetools-2.3 public_key-1.11.1 reltool-0.9 runtime_tools-1.16.2 sasl-4.1 snmp-5.9.1 ssh-4.12.3 ssl-10.4.2 stdlib-3.15.2 syntax_tools-2.6 tftp-1.0.3 tools-3.5 wx-2.0.1 xmerl-1.3.28 :
 OTP-24.0.5 : kernel-8.0.2 # asn1-5.0.16 common_test-1.20.5 compiler-8.0.2 crypto-5.0.2 debugger-5.1 dialyzer-4.4.1 diameter-2.2.4 edoc-1.0 eldap-1.2.9 erl_docgen-1.1.1 erl_interface-5.0.1 erts-12.0.3 et-1.6.5 eunit-2.6.1 ftp-1.1 inets-7.4.1 jinterface-1.12 megaco-4.0.1 mnesia-4.19.1 observer-2.9.6 odbc-2.13.5 os_mon-2.7 parsetools-2.3 public_key-1.11.1 reltool-0.9 runtime_tools-1.16.2 sasl-4.1 snmp-5.9.1 ssh-4.12.3 ssl-10.4.2 stdlib-3.15.2 syntax_tools-2.6 tftp-1.0.3 tools-3.5 wx-2.0.1 xmerl-1.3.28 :