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

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

diff --git a/UPDATING b/UPDATING
index eda198ca095..6935df180c0 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.
 
+20200128	p6	FreeBSD-EN-20:01.ssp
+			FreeBSD-EN-20:02.nmount
+			FreeBSD-SA-20:01.libfetch
+			FreeBSD-SA-20:03.thrmisc
+
+	Fix imprecise ordering of SSP canary initialization [EN-20:01.ssp]
+	
+	Fix nmount invalid pointer dereference [EN-20:02.nmount]
+	
+	Fix libfetch buffer overflow [SA-20:01.libfetch]
+
+	Fix kernel stack data disclosure [SA-20:03.thrmisc]
+	
 20191112	p5	FreeBSD-SA-19:25.mcepsc
 
 	Fix Machine Check Exception on Page Size Change [SA-19:25.mcepsc]
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 46288dc5d31..29cbd7269b6 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.3"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0