summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2019-11-12 18:13:51 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2019-11-12 18:13:51 +0000
commit15f734663fc18c3a4c99255642963969e0fa5089 (patch)
treeb5c85386b5640aca79d13555beafd3617e2457d9
parent693396e3f60d7f3c80eef7e99d4610f9770d2714 (diff)
downloadsrc-test2-15f734663fc18c3a4c99255642963969e0fa5089.tar.gz
src-test2-15f734663fc18c3a4c99255642963969e0fa5089.zip
Notes
-rw-r--r--UPDATING4
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 5 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index e42e951cd638..eda198ca0955 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,10 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
the tip of head, and then rebuild without this option. The bootstrap process
from older version of current across the gcc/clang cutover is a bit fragile.
+20191112 p5 FreeBSD-SA-19:25.mcepsc
+
+ Fix Machine Check Exception on Page Size Change [SA-19:25.mcepsc]
+
20191023 p4 FreeBSD-EN-19:18.tzdata
Import tzdata 2019c. [EN-19:18.tzdata]
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 04e8d6b07eb0..46288dc5d31b 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
TYPE="FreeBSD"
REVISION="11.3"
-BRANCH="RELEASE-p4"
+BRANCH="RELEASE-p5"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi