Merge branch 'lukas/erts/testfixes-19'

* lukas/erts/testfixes-19:
  erts: Increase bif and nif call_time trace test
  erts: Fix distribution_SUITE:bulk_send_bigbig on windows
  erts: Ensure bs_add_overflow test has enough memory
  kernel: Better explain controlling_process' tcp behaviour
  kernel: Fix t_recv_delim on bsd
  os_mon: Make sure to start/stop os_mon in tests correctly
  ssl: Fix use_interface dist_SSL test
  erl_interface: Fix signed int overflow tc bug
  erts: fix atom_roundtrip_r15b tc
  erts: Require more memory for debug tests

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/kernel/doc/src/gen_tcp.xml b/lib/kernel/doc/src/gen_tcp.xml
index 88135ea43d..83242c2df8 100644
--- a/lib/kernel/doc/src/gen_tcp.xml
+++ b/lib/kernel/doc/src/gen_tcp.xml
@@ -232,6 +232,14 @@ do_recv(Sock, Bs) ->
           that receives messages from the socket. If called by any other
           process than the current controlling process,
           <c>{error, not_owner}</c> is returned.</p>
+          <p>If the socket is set in active mode, this function
+          will transfer any messages in the mailbox of the caller
+          to the new controlling process.
+          If any other process is interacting with the socket while
+          the transfer is happening, the transfer may not work correctly
+          and messages may remain in the caller's mailbox. For instance
+          changing the sockets active mode before the transfere is complete
+          may cause this.</p>
       </desc>
     </func>