aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-21 20:46:32 +0100
committerRickard Green <[email protected]>2019-03-21 20:46:32 +0100
commit7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6 (patch)
treec56e50604d0a2828e9b8d73081ae46315242be9b /erts
parent4c8c3f0e66c3d200a2e5891b0649c87f85fe0db2 (diff)
parentdb4eefa49350bb18089f80e21464865f641b614f (diff)
downloadotp-7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6.tar.gz
otp-7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6.tar.bz2
otp-7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # make/otp_version_tickets_in_merge
Diffstat (limited to 'erts')
-rw-r--r--erts/doc/src/notes.xml32
-rw-r--r--erts/vsn.mk2
2 files changed, 33 insertions, 1 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index bdae994d06..248b871ca0 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -31,6 +31,38 @@
</header>
<p>This document describes the changes made to the ERTS application.</p>
+<section><title>Erts 10.3.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>If a suspend/resume signal pair was sent to a process
+ while it was executing dirty, the receiving process could
+ later end up in a suspended state indefinitely. This bug
+ was introduced in ERTS version 10.0 (OTP 21.0).</p>
+ <p>Suspend/resume signals are sent from <seealso
+ marker="erts:erlang#suspend_process/1"><c>erlang:suspend_process()</c></seealso>/<seealso
+ marker="erts:erlang#resume_process/1"><c>erlang:resume_process()</c></seealso>.
+ The <seealso
+ marker="runtime_tools:dbg"><c>dbg</c></seealso> trace
+ tool utilize this functionality and could thus trigger
+ this bug.</p>
+ <p>
+ Own Id: OTP-15688</p>
+ </item>
+ <item>
+ <p>
+ Fix a possible deadlock when terminating the ERTS caused
+ by a dirty scheduler not releasing it's run-queue lock
+ when terminating.</p>
+ <p>
+ Own Id: OTP-15690 Aux Id: PR-2172 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 10.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/erts/vsn.mk b/erts/vsn.mk
index fac608ed4e..3942af7f78 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 10.3
+VSN = 10.3.1
# Port number 4365 in 4.2
# Port number 4366 in 4.3