From c944cb7416ea291d56989168890ec13ff98465d0 Mon Sep 17 00:00:00 2001
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Tue, 1 Dec 2020 19:40:58 +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 74e5bbcadf8..67a929f1314 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.
 
+20201201:	p11	FreeBSD-EN-20:20.tzdata
+			FreeBSD-SA-20:31.icmp6
+			FreeBSD-SA-20:32.rtsold
+
+        Update timezone database information. [EN-20:20.tzdata]
+
+        Fix ICMPv6 use-after-free in error message handling. [SA-20:31.icmp6]
+
+        Fix multiple vulnerabilities in rtsold. [SA-20:32.rtsold]
+
 20200915	p10	FreeBSD-SA-20:27.ure
 			FreeBSD-SA-20:28.bhyve_vmcs
 			FreeBSD-SA-20:29.bhyve_svm
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 0a1dbe789dc..bc67b2d1adb 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="RELEASE-p10"
+BRANCH="RELEASE-p11"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0