From fb01adcfa76f0f32b7788d3a97c9fa79703a1caf Mon Sep 17 00:00:00 2001
From: Mark Johnston <markj@FreeBSD.org>
Date: Tue, 6 Apr 2021 15:07:29 -0400
Subject: [PATCH] Add UPDATING entries and bump version

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

diff --git a/UPDATING b/UPDATING
index dcb82fbcf4a..60c75b005a0 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,22 @@ 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.
 
+20210406:	p6	FreeBSD-EN-21:06.pf
+			FreeBSD-EN-21:07.lldb
+			FreeBSD-SA-21:08.vm
+			FreeBSD-SA-21:09.accept_filter
+			FreeBSD-SA-21:10.jail_mount
+
+		net.pf.request_maxcount not settable from loader.conf(5) [EN-21:06.pf]
+
+		lldb abort on print command [EN-21:07.lldb]
+
+		Memory disclosure by stale virtual memory mapping [SA-21:08.vm]
+
+		Double free in accept_filter(9) socket configuration interface [SA-21:09.accept_filter]
+
+		Jail escape possible by mounting over jail root [SA-21:10.jail_mount]
+
 20210325:	p5	FreeBSD-SA-21:07.openssl
 
 	Fix multiple OpenSSL issues [SA-21:07.openssl]
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 68ee29d3016..51990433f5e 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -49,7 +49,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.2"
-BRANCH="RELEASE-p5"
+BRANCH="RELEASE-p6"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0