aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2017-12-13 10:17:42 +0100
committerHenrik Nord <[email protected]>2017-12-13 10:17:42 +0100
commit7e0d632c9635cb2cd7f635291a9c331612400334 (patch)
tree40ca76b9201d1792a886f17a23302db479e38603 /lib/kernel
parent18a08499db5223dfc3c96b64220a4b3e6a79c799 (diff)
parent44b09e036b31b29dddc3b178e8f6b9fc96a9a874 (diff)
downloadotp-7e0d632c9635cb2cd7f635291a9c331612400334.tar.gz
otp-7e0d632c9635cb2cd7f635291a9c331612400334.tar.bz2
otp-7e0d632c9635cb2cd7f635291a9c331612400334.zip
Merge branch 'maint'
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/doc/src/notes.xml15
-rw-r--r--lib/kernel/vsn.mk2
2 files changed, 16 insertions, 1 deletions
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index a5316dd476..d7f224c38e 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,21 @@
</header>
<p>This document describes the changes made to the Kernel application.</p>
+<section><title>Kernel 5.4.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Refactored an internal API.</p>
+ <p>
+ Own Id: OTP-14784</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Kernel 5.4</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index cef54dd41a..106bda01ca 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 5.4
+KERNEL_VSN = 5.4.1