Merge branch 'maint'

Conflicts:
	OTP_VERSION

5 files changed, 58 insertions, 13 deletions

diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 412675fd2b..dd260f2d1f 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -32,6 +32,50 @@
   <p>This document describes the changes made to the ERTS application.</p>
 
 
+<section><title>Erts 8.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    The emulator got a dynamic library dependency towards
+	    libsctp, which on Linux was not intended since the
+	    emulator there loads and resolves the needed sctp
+	    functions in runtime. This has been fixed and a configure
+	    switch --enable-sctp=lib has been added for those who
+	    want such a library dependency.</p>
+          <p>
+	    Own Id: OTP-13956 Aux Id: ERL-262, ERL-133 </p>
+        </item>
+        <item>
+          <p>
+	    Fix SIGUSR1 crashdump generation</p>
+          <p>
+	    Do not generate a core when a crashdump is asked for.</p>
+          <p>
+	    Own Id: OTP-13997</p>
+        </item>
+        <item>
+	    <p>The new functions in <c>code</c> that allows loading
+	    of many modules at once had a performance problem. While
+	    executing a helper function in the <c>erl_prim_loader</c>
+	    process, garbage messages were produced. The garbages
+	    messages were ignored and ultimately discarded, but there
+	    would be a negative impact on performance and memory
+	    usage. The number of garbage message depended on both the
+	    number of modules to be loaded and the length of the code
+	    path.</p>
+	    <p>The functions affected of this problem were:
+	    <c>atomic_load/1</c>, <c>ensure_modules_loaded/1</c>, and
+	    <c>prepare_loading/1</c>.</p>
+          <p>
+	    Own Id: OTP-14009</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Erts 8.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/emulator/sys/unix/sys.c b/erts/emulator/sys/unix/sys.c
index b0e623a5b9..99e0aea4b5 100644
--- a/erts/emulator/sys/unix/sys.c
+++ b/erts/emulator/sys/unix/sys.c
@@ -672,7 +672,7 @@ sigusr1_exit(void)
     }
 
     prepare_crash_dump(secs);
-    erts_exit(ERTS_ERROR_EXIT, "Received SIGUSR1\n");
+    erts_exit(ERTS_DUMP_EXIT, "Received SIGUSR1\n");
 }
 
 #ifdef ETHR_UNUSABLE_SIGUSRX
diff --git a/erts/preloaded/ebin/erl_prim_loader.beam b/erts/preloaded/ebin/erl_prim_loader.beam
index 796cbd74c5..64d1a70e61 100644
--- a/erts/preloaded/ebin/erl_prim_loader.beam
+++ b/erts/preloaded/ebin/erl_prim_loader.beam
diff --git a/erts/preloaded/src/erl_prim_loader.erl b/erts/preloaded/src/erl_prim_loader.erl
index b3ec73a60e..1d09aeded9 100644
--- a/erts/preloaded/src/erl_prim_loader.erl
+++ b/erts/preloaded/src/erl_prim_loader.erl
@@ -555,17 +555,18 @@ efile_gm_get(Paths, Mod, ParentRef, Process) ->
 
 efile_gm_get_1([P|Ps], File0, Mod, {Parent,Ref}=PR, Process) ->
     File = join(P, File0),
-    Res = try prim_file:read_file(File) of
-	      {ok,Bin} ->
-		  gm_process(Mod, File, Bin, Process);
-	      Error ->
-		  _ = check_file_result(get_modules, File, Error),
-		  efile_gm_get_1(Ps, File0, Mod, PR, Process)
-	  catch
-	      _:Reason ->
-		  {error,{crash,Reason}}
-	  end,
-    Parent ! {Ref,Mod,Res};
+    try prim_file:read_file(File) of
+	{ok,Bin} ->
+	    Res = gm_process(Mod, File, Bin, Process),
+	    Parent ! {Ref,Mod,Res};
+	Error ->
+	    _ = check_file_result(get_modules, File, Error),
+	    efile_gm_get_1(Ps, File0, Mod, PR, Process)
+    catch
+	_:Reason ->
+	    Res = {error,{crash,Reason}},
+	    Parent ! {Ref,Mod,Res}
+    end;
 efile_gm_get_1([], _, Mod, {Parent,Ref}, _Process) ->
     Parent ! {Ref,Mod,{error,enoent}}.
 
diff --git a/erts/vsn.mk b/erts/vsn.mk
index ad9148f61f..317d731cd7 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
 # %CopyrightEnd%
 # 
 
-VSN = 8.1
+VSN = 8.1.1
 
 # Port number 4365 in 4.2
 # Port number 4366 in 4.3