From e75cfcd9dbc5a404b27ed6f86fc9eec00ecbf535 Mon Sep 17 00:00:00 2001
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Tue, 28 Jan 2020 18:58:37 +0000
Subject: [PATCH] Add UPDATING entries and bump version.

Approved by:	so
---
 UPDATING            | 10 ++++++++++
 sys/conf/newvers.sh |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 58dae591ea3..100ad5d84ba 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,16 @@ 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.
 
+20200128	p2	FreeBSD-EN-20:01.ssp
+			FreeBSD-SA-20:01.libfetch
+			FreeBSD-SA-20:03.thrmisc
+
+        Fix imprecise ordering of SSP canary initialization [EN-20:01.ssp]
+
+        Fix libfetch buffer overflow [SA-20:01.libfetch]
+
+        Fix kernel stack data disclosure [SA-20:03.thrmisc]
+
 20191112	p1	FreeBSD-EN-19:19.loader
 			FreeBSD-SA-19:25.mcepsc
 
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 2ab3101e467..341966006ea 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0