From 494ab951b42f6dd74d0b516e73f3ded25867c675 Mon Sep 17 00:00:00 2001
From: gordon <gordon@FreeBSD.org>
Date: Tue, 9 Jun 2020 16:15:07 +0000
Subject: [PATCH] Add UPDATING entries and bump version.

Approved by:	so
Approved by:	re (implicit)
---
 UPDATING            | 4 ++++
 sys/conf/newvers.sh | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 826efacccd2..90fd5e7b9b1 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,10 @@ 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.
 
+20200609	p21	FreeBSD-SA-20:17.usb
+
+        Fix USB HID descriptor parsing error. [SA-20:17.usb]
+
 20200512	p20	FreeBSD-EN-20:08.tzdata
 			FreeBSD-EN-20:10.build
 			FreeBSD-SA-20:12.libalias
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index bc3578aaab0..6dcbfee8084 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="RELEASE-p20"
+BRANCH="RELEASE-p21"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi