From d328f453e7cd6e24856b0c80e0b8c4ed6def5461 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 11 Jul 2011 15:40:44 +0200
Subject: Prepare release

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

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 3733fb2db9..2e6aca2951 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -30,6 +30,53 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 5.8.4.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix bug in tracing with matchspec body containing
+	    <c>enable_trace</c> or <c>disable_trace</c>. Could cause
+	    emulator crash if trace was altered with
+	    erlang:trace_pattern by racing process during ongoing
+	    tracing.</p>
+          <p>
+	    Own Id: OTP-9422 Aux Id: seq11868 </p>
+        </item>
+        <item>
+          <p>
+	    Fix emulator deadlock in <c>ets:delete</c> on tables with
+	    <c>write_concurrency</c> caused by race with concurrent
+	    process that tries to do other operation on the same
+	    table. Does not apply to <c>ordered_set</c>. Bug exist
+	    since R14B.</p>
+          <p>
+	    Own Id: OTP-9423 Aux Id: seq11872 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    The <c>erts_alloc_util</c> framework has been extended
+	    with functionality for separation of small blocks from
+	    other blocks in separate carriers. This functionality is
+	    currently disabled by default, but can be enabled in
+	    order to finetune memory management. For more information
+	    see <seealso
+	    marker="erts:erts_alloc">erts_alloc(3)</seealso>.</p>
+          <p>
+	    Own Id: OTP-9339 Aux Id: Seq11780 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 5.8.4</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 193a914a70..6be703d453 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 5.8.4
+VSN = 5.8.4.1
 SYSTEM_VSN = R14B03
 
 # Port number 4365 in 4.2
-- 
cgit v1.2.3