From 46b2ed296e1ca3ef2f46c3acac887eb2d10c2c4f Mon Sep 17 00:00:00 2001
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Wed, 8 Jul 2020 20:26:19 +0000
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 28d8d41d83d..844c00adc0d 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.
 
+20200708	p7	FreeBSD-EN-20:13.bhyve
+			FreeBSD-EN-20:14.linuxkpi
+			FreeBSD-EN-20:15.mps
+			FreeBSD-SA-20:19.unbound
+			FreeBSD-SA-20:20.ipv6
+
+        Fix host crash in bhyve with PCI device passthrough. [EN-20:13.bhyve]
+
+        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	p6	FreeBSD-EN-20:11.ena
 			FreeBSD-EN-20:12.iflib
 			FreeBSD-SA-20:17.usb
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index e24e5382a52..5159357a779 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0