From b335afff80c87a897b6200d30828e959a0216faf Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Fri, 25 Aug 2017 09:36:10 +0200
Subject: Prepare release

---
 erts/doc/src/notes.xml | 32 ++++++++++++++++++++++++++++++++
 erts/vsn.mk            |  2 +-
 2 files changed, 33 insertions(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 008d43b51a..367d6d4d0a 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>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index f90870b7c8..8ed3993177 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 9.0.3
+VSN = 9.0.4
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3