git: 95f9e56d8429 - releng/11.4 - Add UPDATING entry and bump version

[Ed Maste]

The branch releng/11.4 has been updated by emaste:

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

commit 95f9e56d8429ba88cc563891ff66df36b28af4d7
Author:     Ed Maste <emaste at FreeBSD.org>
AuthorDate: 2021-01-29 00:16:22 +0000
Commit:     Ed Maste <emaste at FreeBSD.org>
CommitDate: 2021-01-29 00:16:35 +0000

    Add UPDATING entry 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 e648aa94e1d6..9e75e2201d6b 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.
 
+20210128:	p7	FreeBSD-EN-21:01.tzdata
+			FreeBSD-EN-21:02.extattr
+			FreeBSD-EN-21:05.libatomic
+			FreeBSD-SA-21:01.fsdisclosure
+			FreeBSD-SA-21:02.xenoom
+
+	Update timezone database information [EN-21:01.tzdata]
+
+	UFS extattr corruption [EN-21:02.extattr]
+
+	Atomic and bswap functions in libcompiler_rt [EN-21:05.libatomic]
+
+	Uninitialized file system kernel stack leaks [SA-21:01.fsdisclosure]
+
+	Xen guest-triggered out of memory [SA-21:02.xenoom]
+
 20201215:	p6	FreeBSD-SA-20:33.openssl
 
         Fix OpenSSL NULL pointer de-reference. [SA-20:33.openssl]
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 5400423949cd..e9d5ad3f5d41 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -44,7 +44,7 @@
 
 TYPE="FreeBSD"
 REVISION="11.4"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi