From 1f1c7a90ff5bacf19f0437e6f54cfe97e2d25e97 Mon Sep 17 00:00:00 2001
From: Rickard Green <rickard@erlang.org>
Date: Thu, 22 Jun 2017 16:11:52 +0200
Subject: Fix statistics(wall_clock) and statistics(runtime) implementation

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

(limited to 'erts/doc')

diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index c3b0bc0d74..24a091073d 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -6362,6 +6362,9 @@ lists:map(
         <p>This is the sum of the runtime for all threads
           in the Erlang runtime system and can therefore be greater
           than the wall clock time.</p>
+          <warning><p>This value might wrap due to limitations in the
+          underlying functionality provided by the operating system
+          that is used.</p></warning>
         <p>Example:</p>
         <pre>
 > <input>statistics(runtime).</input>
-- 
cgit v1.2.3


From fde4d57419fdf29d850b7cb82b5cac4f9ffa4a5f Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Mon, 26 Jun 2017 16:03:21 +0200
Subject: Update release notes

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

(limited to 'erts/doc')

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index f0de301982..48475ae305 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,43 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 8.3.5.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed a bug in gen_tcp:send where it never returned when
+	    repeatedly called on a remotely closed TCP socket.</p>
+          <p>
+	    Own Id: OTP-13939 Aux Id: ERL-193 </p>
+        </item>
+        <item>
+          <p>
+	    Fixed segfault that could happen during cleanup of
+	    aborted erlang:port_command/3 calls. A port_command is
+	    aborted if the port is closed at the same time as the
+	    port_command was issued. This bug was introduced in
+	    erts-8.0.</p>
+          <p>
+	    Own Id: OTP-14481</p>
+        </item>
+        <item>
+          <p>
+	    Fixed implementation of <c>statistics(wall_clock)</c> and
+	    <c>statistics(runtime)</c> so that values do not
+	    unnecessarily wrap due to the emulator. Note that the
+	    values returned by <c>statistics(runtime)</c> may still
+	    wrap due to limitations in the underlying functionality
+	    provided by the operating system.</p>
+          <p>
+	    Own Id: OTP-14484</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 8.3.5</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
-- 
cgit v1.2.3