Merge branch 'maint-20' into maint

* maint-20:
  Updated OTP version
  Prepare release
  dialyzer: Fix a bug where merging PLT:s could lose info

1 files changed, 32 insertions, 0 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 3d7858a034..f6bc6e984b 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,38 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 9.0.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    A timer internal bit-field used for storing scheduler id
+	    was too small. As a result, VM internal timer data
+	    structures could become inconsistent when using 1024
+	    schedulers on the system. Note that systems with less
+	    than 1024 schedulers are not effected by this bug.</p>
+          <p>
+	    This bug was introduced in ERTS version 7.0 (OTP 18.0).</p>
+          <p>
+	    Own Id: OTP-14548 Aux Id: OTP-11997, ERL-468 </p>
+        </item>
+        <item>
+          <p>
+	    Automatic cleanup of a BIF timer, when the owner process
+	    terminated, could race with the timeout of the timer.
+	    This could cause the VM internal data structures to
+	    become inconsistent which very likely caused a VM crash.</p>
+          <p>
+	    This bug was introduced in ERTS version 9.0 (OTP 20.0).</p>
+          <p>
+	    Own Id: OTP-14554 Aux Id: OTP-14356, ERL-468 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 9.0.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>