git: f5ddeabc08e7 - releng/12.2 - Add UPDATING entries and bump version

[Mark Johnston]

The branch releng/12.2 has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=f5ddeabc08e7f8a1c371dc1803c02d4a415817f1

commit f5ddeabc08e7f8a1c371dc1803c02d4a415817f1
Author:     Mark Johnston <markj at FreeBSD.org>
AuthorDate: 2021-05-26 20:23:58 +0000
Commit:     Mark Johnston <markj at FreeBSD.org>
CommitDate: 2021-05-26 20:36:18 +0000

    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 898bd853fe9a..d4d236cb8395 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.
 
+20210526:	p7	FreeBSD-EN-21:11.aesni
+			FreeBSD-EN-21:14.pms
+			FreeBSD-SA-21:11.smap
+			FreeBSD-SA-21:12.libradius
+
+		Race condition in aesni(4) encrypt-then-auth operations [FreeBSD-EN-21:11.aesni]
+
+		pms(4) data corruption [FreeBSD-EN-21:14.pms]
+
+		SMAP bypass [FreeBSD-SA-21:11.smap]
+
+		Missing message validation in libradius(3) [FreeBSD-SA-21:12.libradius]
+
 20210406:	p6	FreeBSD-EN-21:09.pf
 			FreeBSD-EN-21:10.lldb
 			FreeBSD-SA-21:08.vm
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 51990433f5e6..db48e3ee749b 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -49,7 +49,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.2"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi