From 3162499ddc48d4ce877945775f084725ceab57c5 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 12 Feb 2018 13:38:24 +0100
Subject: Update version numbers

---
 erts/vsn.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'erts')

diff --git a/erts/vsn.mk b/erts/vsn.mk
index 8b22afea3b..50b77fdbc0 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 9.2
+VSN = 9.2.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3
-- 
cgit v1.2.3


From e11c649522be8849cc21e364734be62c7783f090 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 12 Feb 2018 13:38:43 +0100
Subject: Update release notes

---
 erts/doc/src/notes.xml | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

(limited to 'erts')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 39dd90b8a0..f62788d2d8 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,48 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 9.2.1</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Improve search algorithm of abandoned memory carriers.
+	    Instead of limited linear search, each allocator instance
+	    maintain a balanced search tree of all its abandoned
+	    carriers for faster and more exhaustive search.</p>
+          <p>
+	    Own Id: OTP-14915 Aux Id: ERIERL-88 </p>
+        </item>
+        <item>
+          <p>
+	    New erts_alloc command line options <c>+M_acnl</c> and
+	    <c>+M_acfml</c> to limit carrier abandonment.</p>
+          <p>
+	    Own Id: OTP-14916 Aux Id: ERIERL-88 </p>
+        </item>
+        <item>
+          <p>
+	    New family of <c>erts_alloc</c> strategies: Age Order
+	    First Fit. Similar to "address order", but instead the
+	    oldest possible carrier is always chosen for allocation.</p>
+          <p>
+	    Own Id: OTP-14917 Aux Id: ERIERL-88 </p>
+        </item>
+        <item>
+          <p>
+	    Add possibility to change allocator options at runtime
+	    with <c>system_info(erts_alloc, ...)</c>. Only option
+	    <c>sbct</c> (single block carrier threshold) is currently
+	    supported via this interface.</p>
+          <p>
+	    Own Id: OTP-14918 Aux Id: ERIERL-88 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 9.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3