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
commit916c699956734a3659fba6cbe95445ab1af41c15 (patch)
tree9e91e0739aee8ffcf7eef9246e80bf82103b27e6
parent61ba71b7dbca5170215e39fd3cc55853107844b8 (diff)
downloadsrc-test2-916c699956734a3659fba6cbe95445ab1af41c15.tar.gz
src-test2-916c699956734a3659fba6cbe95445ab1af41c15.zip
Notes
-rw-r--r--UPDATING7
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 8 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index d98a8e4facea..6fea8d42985a 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,13 @@ 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 p12 FreeBSD-EN-19:19.loader
+ FreeBSD-SA-19:25.mcepsc
+
+ Fix UEFI Loader Memory Fragmentation [EN-19:19.loader]
+
+ Fix Machine Check Exception on Page Size Change [SA-19:25.mcepsc]
+
20191023 p11 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 39930c3fa14c..940793e62cb2 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.0"
-BRANCH="RELEASE-p11"
+BRANCH="RELEASE-p12"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi