Prepare release

5 files changed, 86 insertions, 6 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index dbf2b2b7a0..217a8eadf6 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,69 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 9.3.3.15</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A process could end up in a state where it got endlessly
+	    rescheduled without making any progress. This occurred
+	    when a system task, such as check of process code (part
+	    of a code purge), was scheduled on a high priority
+	    process trying to execute on a dirty scheduler.</p>
+          <p>
+	    Own Id: OTP-16436 Aux Id: ERL-1152 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed bug in <c>erlang:list_to_ref/1</c> when called with
+	    a reference created by a remote note. Function
+	    <c>list_to_ref/1</c> is intended for debugging and not to
+	    be used in application programs. Bug exist since OTP
+	    20.0.</p>
+          <p>
+	    Own Id: OTP-16438</p>
+        </item>
+        <item>
+          <p>
+	    A process could get into an inconsistent state where it
+	    was runnable, but never scheduled for execution. This
+	    could occur when a mix of <c>normal</c> and <c>low</c>
+	    priority processes where scheduled on the same type of
+	    dirty scheduler simultaneously.</p>
+          <p>
+	    Own Id: OTP-16446 Aux Id: ERL-1157 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed erroneous mapping of exit reason from <c>kill</c>
+	    to <c>killed</c> on reception of some exit signals due to
+	    a broken link. This bug has existed since ERTS version
+	    5.5.2 (OTP R11).</p>
+          <p>
+	    This bug was also unknowingly fixed in ERTS version 10.0
+	    (OTP 21.0) due to a new ERTS internal implementation of
+	    signaling between processes.</p>
+          <p>
+	    Own Id: OTP-16465 Aux Id: ERL-1165, OTP-6160, OTP-14589 </p>
+        </item>
+        <item>
+          <p>
+	    Corrected the valid range of the <c>erl</c> command line
+	    argument <seealso marker="erts:erl#+SDio"><c>+SDio
+	    &lt;NumberOfDirtyIoSchedulers&gt;</c></seealso> from
+	    <c>0..1024</c> to <c>1..1024</c>. <c>+SDio 0</c> was
+	    erroneously allowed which just caused the VM to crash on
+	    the first dirty I/O job scheduled.</p>
+          <p>
+	    Own Id: OTP-16481</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 9.3.3.14</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 254f5d3439..501c0bc509 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 9.3.3.14
+VSN = 9.3.3.15
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 36c2e2ae5b..353d0cddb4 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,21 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 4.6.9.7</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed possible hanging in <c>ssh_sftp:stop_channel/1</c>.</p>
+          <p>
+	    Own Id: OTP-16507 Aux Id: ERIERL-470 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Ssh 4.6.9.6</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index e5535cc4bf..062d072d92 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.6.9.6
+SSH_VSN = 4.6.9.7
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 37f16dabe1..9e50e14466 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,4 +1,6 @@
-OTP-16373
-OTP-16375
-OTP-16376
-OTP-16379
+OTP-16436
+OTP-16438
+OTP-16446
+OTP-16465
+OTP-16481
+OTP-16507