From 3689a02291f7584ff04b34ac191c727d8a618476 Mon Sep 17 00:00:00 2001
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Tue, 21 Apr 2020 15:54:08 +0000
Subject: [PATCH] Add UPDATING entries and bump version.

Approved by:	so
---
 UPDATING            | 10 ++++++++++
 sys/conf/newvers.sh |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index 07c6509e71e..7fb83a02ece 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,16 @@ 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.
 
+20200421	p4	FreeBSD-EN-20:07.quotad
+			FreeBSD-SA-20:10.ipfw
+			FreeBSD-SA-20:11.openssl
+
+        Fix regression in rpc.rquotad with certain NFS servers [EN-20:07.quotad]
+
+        Fix ipfw invalid mbuf handling [SA-20:10.ipfw]
+
+        Fix OpenSSL remote denial of service vulnerability [SA-20:11.openssl]
+
 20200319	p3	FreeBSD-EN-20:03.sshd
 			FreeBSD-EN-20:05.mlx5en
 			FreeBSD-EN-20:06.ipv6
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 65a3a1903d5..71793d84d9f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -46,7 +46,7 @@
 
 TYPE="FreeBSD"
 REVISION="12.1"
-BRANCH="RELEASE-p3"
+BRANCH="RELEASE-p4"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi
-- 
2.45.0