Merge branch 'maint-20' into maint

* maint-20:
  Updated OTP version
  Update release notes
  Update version numbers
  erts: Fix so that bind correct schedulers
  Update version
  Fix error handling when decoding an AVP with an alternate dictionary
  Remove unused function arguments
  Fix faulty recursion
  vsn -> 2.1.2
  Update appup for ERIERL-14684
  Fix speling error 'sndbuf' -> 'recbuf'
  Add zlib:set_controlling_process/2

2 files changed, 37 insertions, 0 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index e4cb101a4f..e4c33f8bd3 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,29 @@
   </header>
   <p>This document describes the changes made to the ERTS application.</p>
 
+<section><title>Erts 9.1.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Added zlib:set_controlling_process/2 to move a
+	    zstream() between processes.</p>
+          <p>
+	    Own Id: OTP-14672 Aux Id: ERL-494 </p>
+        </item>
+        <item>
+          <p>
+	    Fix so that schedulers are bound correctly when the first
+	    available cpu is not the first detected cpu. e.g. when
+	    using "taskset -c X..Y" when X is not equal to 0.</p>
+          <p>
+	    Own Id: OTP-14694</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 9.1.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/doc/src/zlib.xml b/erts/doc/src/zlib.xml
index f5cc1b1e64..6f4c42da27 100644
--- a/erts/doc/src/zlib.xml
+++ b/erts/doc/src/zlib.xml
@@ -71,6 +71,11 @@ list_to_binary([Compressed|Last])</pre>
       called prior to a call to
       <seealso marker="#inflate/2"><c>inflate/2</c></seealso>.
       </item>
+      <tag><c>not_on_controlling_process</c></tag>
+      <item>The stream was used by a process that doesn't control it. Use
+      <seealso marker="#set_controlling_process/2">
+      <c>set_controlling_process/2</c></seealso> if you need to transfer
+      a stream to a different process.</item>
       <tag><c>data_error</c></tag>
       <item>The data contains errors.
       </item>
@@ -740,6 +745,15 @@ loop(Z, Handler, {finished, Output}) ->
     </func>
 
     <func>
+      <name name="set_controlling_process" arity="2"/>
+      <fsummary>Transfers ownership of a zlib stream.</fsummary>
+      <desc>
+        <p>Changes the controlling process of <c><anno>Z</anno></c> to
+           <c><anno>Pid</anno></c>, which must be a local process.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="uncompress" arity="1"/>
       <fsummary>Uncompress data with standard zlib functionality.</fsummary>
       <desc>