aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2021-01-29 00:16:22 +0000
committerEd Maste <emaste@FreeBSD.org>2021-01-29 01:01:02 +0000
commit3df06c28ba9575537c4e313bc400713a922dee03 (patch)
treec14f4d82c8eee294ee04d7c2011b749b87b72689
parent785afb167cc4cdbf4d281da214456cb4ef12469d (diff)
downloadsrc-3df06c28ba9575537c4e313bc400713a922dee03.tar.gz
src-3df06c28ba9575537c4e313bc400713a922dee03.zip
Add UPDATING entry and bump versionreleng/12.1
Approved by: so
-rw-r--r--UPDATING13
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 14 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 458ed5b73afc..4f9b8a306a93 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,19 @@ 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.
+20210128: p13 FreeBSD-EN-21:01.tzdata
+ FreeBSD-EN-21:03.vnet
+ FreeBSD-SA-21:01.fsdisclosure
+ FreeBSD-SA-21:02.xenoom
+
+ Update timezone database information [EN-21:01.tzdata]
+
+ Panic when destroying VNET and epair simultaneously [EN-21:03.vnet]
+
+ Uninitialized file system kernel stack leaks [SA-21:01.fsdisclosure]
+
+ Xen guest-triggered out of memory [SA-21:02.xenoom]
+
20201208: p12 FreeBSD-SA-20:33.openssl
Fix OpenSSL NULL pointer de-reference. [SA-20:33.openssl]
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index b58d86e4e84a..050f13aea1c2 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
TYPE="FreeBSD"
REVISION="12.1"
-BRANCH="RELEASE-p12"
+BRANCH="RELEASE-p13"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi