From da7860263e6306424e0a27a7eb049d77f4fceaaa Mon Sep 17 00:00:00 2001
From: gordon <gordon@FreeBSD.org>
Date: Wed, 8 Jul 2020 20:26:19 +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 90fd5e7b9b1..11c2a7846b9 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.
 
+20200708	p22	FreeBSD-EN-20:14.linuxkpi
+			FreeBSD-EN-20:15.mps
+			FreeBSD-SA-20:19.unbound
+			FreeBSD-SA-20:20.ipv6
+
+        Fix kernel panic in LinuxKPI subsystem. [EN-20:14.linuxpki]
+
+        Fix kernel panic in mps(4) driver. [EN-20:15.mps]
+
+        Fix multiple vulnerabilities in unbound. [SA-20:19.unbound]
+
+        Fix IPv6 socket option race condition and use after free. [SA-20:20.ipv6]
+
 20200609	p21	FreeBSD-SA-20:17.usb
 
         Fix USB HID descriptor parsing error. [SA-20:17.usb]
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 6dcbfee8084..352bf164e07 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.2"
-BRANCH="RELEASE-p21"
+BRANCH="RELEASE-p22"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi